- Enabled panel_size in preferences.

4 files changed, 10 insertions, 9 deletions

diff --git a/src/prefs.c b/src/prefs.c
index 32ce6cd3..72ed3b40 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -167,13 +167,13 @@ static int Prefs_parse_pair(char *name, char *value)
       break;
    case DRC_TOKEN_PANEL_SIZE:
       if (!dStrcasecmp(value, "tiny"))
-         prefs.panel_size = 1;
+         prefs.panel_size = P_tiny;
       else if (!dStrcasecmp(value, "small"))
-         prefs.panel_size = 2;
+         prefs.panel_size = P_small;
       else if (!dStrcasecmp(value, "medium"))
-         prefs.panel_size = 3;
+         prefs.panel_size = P_medium;
       else /* default to "large" */
-         prefs.panel_size = 4;
+         prefs.panel_size = P_large;
       break;
    case DRC_TOKEN_SMALL_ICONS:
       prefs.small_icons = (strcmp(value, "YES") == 0);
@@ -345,7 +345,7 @@ void a_Prefs_init(void)
    prefs.force_my_colors = FALSE;
    prefs.contrast_visited_color = FALSE;
    prefs.show_tooltip = FALSE;
-   prefs.panel_size = 1;
+   prefs.panel_size = P_tiny;
    prefs.small_icons = FALSE;
    prefs.limit_text_width = FALSE;
    prefs.w3c_plus_heuristics = TRUE;
diff --git a/src/prefs.h b/src/prefs.h
index 49d3f3f0..895e2a75 100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -20,6 +20,8 @@ extern "C" {
 #define DW_COLOR_DEFAULT_PURPLE 0x800080
 #define DW_COLOR_DEFAULT_BGND   0xd6d6c0
 
+/* Panel sizes */
+enum { P_tiny = 0, P_small, P_medium, P_large };
 
 /* define enumeration values to be returned for specific symbols */
 typedef enum {
diff --git a/src/ui.cc b/src/ui.cc
index f9c57844..7e9568ff 100644
--- a/src/ui.cc
+++ b/src/ui.cc
@@ -593,7 +593,9 @@ UI::UI(int win_w, int win_h, const char* label, const UI *cur_ui) :
    } else {
      // Set some default values
      //PanelSize = P_tiny, CuteColor = 26, Small_Icons = 0;
-     PanelSize = P_medium, CuteColor = 206, Small_Icons = 0;
+     PanelSize = prefs.panel_size;
+     Small_Icons = prefs.small_icons;
+     CuteColor = 206;
    }
 
    resizable(this);
diff --git a/src/ui.hh b/src/ui.hh
index b895c4fd..0e70e47f 100644
--- a/src/ui.hh
+++ b/src/ui.hh
@@ -13,9 +13,6 @@
 
 using namespace fltk;
 
-// Panel sizes
-enum { P_tiny = 0, P_small, P_medium, P_large };
-
 typedef enum {
    UI_BACK = 0,
    UI_FORW,