From d879967fa842b9cc3f8a0413ceb7868b64990f1e Mon Sep 17 00:00:00 2001
From: Stefan Schippers <stefan.schippers@gmail.com>
Date: Thu, 27 Aug 2020 12:57:49 +0200
Subject: [PATCH] less padding space around menu entries & buttons

---
 src/save.c     |  2 +-
 src/xschem.h   |  2 +-
 src/xschem.tcl | 28 ++++++++++++++--------------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/save.c b/src/save.c
index 7f732974..44af29af 100644
--- a/src/save.c
+++ b/src/save.c
@@ -860,7 +860,7 @@ void make_symbol(void)
          
 }
 
-int save_schematic(char *schname) /* 20171020 added return value */
+int save_schematic(const char *schname) /* 20171020 added return value */
 {
   FILE *fd;
   char name[PATH_MAX]; /* overflow safe 20161122 */
diff --git a/src/xschem.h b/src/xschem.h
index d1bda231..8a488b3c 100644
--- a/src/xschem.h
+++ b/src/xschem.h
@@ -836,7 +836,7 @@ extern int place_symbol(int pos, const char *symbol_name, double x, double y, in
 extern void attach_labels_to_inst(void);
 extern int sym_vs_sch_pins(void);
 extern int match_symbol(const char name[]);
-extern int save_schematic(char *); /*  20171020 added return value */
+extern int save_schematic(const char *); /*  20171020 added return value */
 extern void push_undo(void);
 extern void pop_undo(int redo);
 extern void delete_undo(void);
diff --git a/src/xschem.tcl b/src/xschem.tcl
index ff951694..4d4f3eaa 100644
--- a/src/xschem.tcl
+++ b/src/xschem.tcl
@@ -3183,28 +3183,28 @@ font configure Underline-Font -underline true -size 24
    frame .menubar -relief raised -bd 2 
    toolbar_toolbar
 
-   menubutton .menubar.file -text "File" -menu .menubar.file.menu
+   menubutton .menubar.file -text "File" -menu .menubar.file.menu -padx 3 -pady 0
    menu .menubar.file.menu -tearoff 0
-   menubutton .menubar.edit -text "Edit" -menu .menubar.edit.menu
+   menubutton .menubar.edit -text "Edit" -menu .menubar.edit.menu -padx 3 -pady 0
    menu .menubar.edit.menu -tearoff 0
-   menubutton .menubar.option -text "Options" -menu .menubar.option.menu
+   menubutton .menubar.option -text "Options" -menu .menubar.option.menu -padx 3 -pady 0
    menu .menubar.option.menu -tearoff 0
-   menubutton .menubar.zoom -text "View" -menu .menubar.zoom.menu
+   menubutton .menubar.zoom -text "View" -menu .menubar.zoom.menu -padx 3 -pady 0
    menu .menubar.zoom.menu -tearoff 0
-   menubutton .menubar.prop -text "Properties" -menu .menubar.prop.menu
+   menubutton .menubar.prop -text "Properties" -menu .menubar.prop.menu -padx 3 -pady 0
    menu .menubar.prop.menu -tearoff 0
-   menubutton .menubar.layers -text "Layers" -menu .menubar.layers.menu \
+   menubutton .menubar.layers -text "Layers" -menu .menubar.layers.menu -padx 3 -pady 0 \
     -background [lindex $colors 4]
    menu .menubar.layers.menu -tearoff 0
-   menubutton .menubar.tools -text "Tools" -menu .menubar.tools.menu
+   menubutton .menubar.tools -text "Tools" -menu .menubar.tools.menu -padx 3 -pady 0
    menu .menubar.tools.menu -tearoff 0
-   menubutton .menubar.sym -text "Symbol" -menu .menubar.sym.menu
+   menubutton .menubar.sym -text "Symbol" -menu .menubar.sym.menu -padx 3 -pady 0
    menu .menubar.sym.menu -tearoff 0
-   menubutton .menubar.hilight -text "Highlight" -menu .menubar.hilight.menu
+   menubutton .menubar.hilight -text "Highlight" -menu .menubar.hilight.menu -padx 3 -pady 0
    menu .menubar.hilight.menu -tearoff 0
-   menubutton .menubar.simulation -text "Simulation" -menu .menubar.simulation.menu
+   menubutton .menubar.simulation -text "Simulation" -menu .menubar.simulation.menu -padx 3 -pady 0
    menu .menubar.simulation.menu -tearoff 0
-   menubutton .menubar.help -text "Help" -menu .menubar.help.menu
+   menubutton .menubar.help -text "Help" -menu .menubar.help.menu -padx 3 -pady 0
    menu .menubar.help.menu -tearoff 0
    .menubar.help.menu add command -label "Help" -command "textwindow \"${XSCHEM_SHAREDIR}/xschem.help\" ro" \
         -accelerator {?}
@@ -3383,11 +3383,11 @@ font configure Underline-Font -underline true -size 24
    toolbar_create EditPushSym "xschem descend_symbol" "Push symbol"
    .menubar.edit.menu add command -label "Pop" -command "xschem go_back" -accelerator Ctrl+E
    toolbar_create EditPop "xschem go_back" "Pop"
-   button .menubar.waves -text "Waves"  -activebackground red  -takefocus 0\
+   button .menubar.waves -text "Waves"  -activebackground red  -takefocus 0 -padx 2 -pady 0 \
      -command {
        waves
       }
-   button .menubar.simulate -text "Simulate"  -activebackground red  -takefocus 0\
+   button .menubar.simulate -text "Simulate"  -activebackground red  -takefocus 0 -padx 2 -pady 0 \
      -command {
        if { ![info exists simulate_oldbg] } {
          set simulate_oldbg [.menubar.simulate cget -bg]
@@ -3395,7 +3395,7 @@ font configure Underline-Font -underline true -size 24
          simulate {.menubar.simulate configure -bg $::simulate_oldbg; unset ::simulate_oldbg}
        }
       }
-   button .menubar.netlist -text "Netlist"  -activebackground red  -takefocus 0\
+   button .menubar.netlist -text "Netlist"  -activebackground red  -takefocus 0 -padx 2 -pady 0 \
      -command {
        xschem netlist
       }