Wider margin around window edges

To conform with how e.g. GNOME sets its margins.

diff --git a/vncviewer/OptionsDialog.cxx b/vncviewer/OptionsDialog.cxx
index 55b3ca086db21aeed766a64f5b3127b652adb4ef..a31b8a63ad1e539e5b01efd0858e8f7f35cc7c67 100644 (file)
--- a/vncviewer/OptionsDialog.cxx
+++ b/vncviewer/OptionsDialog.cxx
@@ -74,10 +74,10 @@ OptionsDialog::OptionsDialog()
   //        have any separator for the caption, which looks odd
 #ifdef WIN32
   navigation = new Fl_Navigation(-1, 0, w()+2,
-                                 h() - INNER_MARGIN - BUTTON_HEIGHT - OUTER_MARGIN);
+                                 h() - OUTER_MARGIN - BUTTON_HEIGHT - OUTER_MARGIN);
 #else
   navigation = new Fl_Navigation(-1, -1, w()+2,
-                                 h()+1 - INNER_MARGIN - BUTTON_HEIGHT - OUTER_MARGIN);
+                                 h()+1 - OUTER_MARGIN - BUTTON_HEIGHT - OUTER_MARGIN);
 #endif
   {
     int tx, ty, tw, th;

diff --git a/vncviewer/fltk/layout.h b/vncviewer/fltk/layout.h
index e555a11bf3e4d1dd091286bc9cf0cc3c8b255f2e..3799204e471d9e168873c96f455dacab8f2e712e 100644 (file)
--- a/vncviewer/fltk/layout.h
+++ b/vncviewer/fltk/layout.h
@@ -40,7 +40,7 @@ static inline int gui_str_len(const char *str)
 
 /**** MARGINS ****/
 
-#define OUTER_MARGIN            10
+#define OUTER_MARGIN            15
 #define INNER_MARGIN            10
 
 /* Tighter grouping of related fields */