5 files changed, 18 insertions, 9 deletions

diff --git a/src/prefs.c b/src/prefs.c
index 98406034..4b45b51e 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -93,6 +93,7 @@ void a_Prefs_init(void)
    prefs.show_quit_dialog = TRUE;
    prefs.show_reload = TRUE;
    prefs.show_save = TRUE;
+   prefs.show_url = TRUE;
    prefs.show_search = TRUE;
    prefs.show_stop = TRUE;
    prefs.show_tools = TRUE;
diff --git a/src/prefs.h b/src/prefs.h
index f0cfce48..bdb3aaee 100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -81,6 +81,7 @@ typedef struct {
    bool_t show_tools;
    bool_t show_filemenu;
    bool_t show_clear_url;
+   bool_t show_url;
    bool_t show_search;
    bool_t show_help;
    bool_t show_progress_box;
diff --git a/src/prefsparser.cc b/src/prefsparser.cc
index a2de1cfa..f6522d45 100644
--- a/src/prefsparser.cc
+++ b/src/prefsparser.cc
@@ -103,6 +103,7 @@ int PrefsParser::parseOption(char *name, char *value)
       { "show_quit_dialog", &prefs.show_quit_dialog, PREFS_BOOL },
       { "show_reload", &prefs.show_reload, PREFS_BOOL },
       { "show_save", &prefs.show_save, PREFS_BOOL },
+      { "show_url", &prefs.show_url, PREFS_BOOL },
       { "show_search", &prefs.show_search, PREFS_BOOL },
       { "show_stop", &prefs.show_stop, PREFS_BOOL },
       { "show_tools", &prefs.show_tools, PREFS_BOOL },
diff --git a/src/ui.cc b/src/ui.cc
index 9ff4a0a4..d3bc7ff6 100644
--- a/src/ui.cc
+++ b/src/ui.cc
@@ -455,12 +455,16 @@ void UI::make_location(int ww)
     b->set_tooltip("Clear the URL box.\nMiddle-click to paste a URL.");
     p_xpos += b->w();
 
-    CustInput *i = new CustInput(p_xpos,0,ww-p_xpos-32,lh,0);
-    Location = i;
-    i->when(FL_WHEN_ENTER_KEY);
-    i->callback(location_cb, this);
-    i->set_tooltip("Location");
-    p_xpos += i->w();
+    LocationGroup = new Fl_Group(p_xpos,0,ww-p_xpos-32,lh,0);
+    LocationGroup->begin();
+     CustInput *i = new CustInput(p_xpos,0,ww-p_xpos-32,lh,0);
+     Location = i;
+     i->when(FL_WHEN_ENTER_KEY);
+     i->callback(location_cb, this);
+     i->set_tooltip("Location");
+     p_xpos += i->w();
+    LocationGroup->box(FL_THIN_UP_BOX);   // or FL_FLAT_BOX
+    LocationGroup->end();
 
     Search = b = new CustButton(p_xpos,0,16,lh,0);
     b->image(icons->ImgSearch);
@@ -567,7 +571,7 @@ void UI::make_panel(int ww)
        make_toolbar(ww,bh);
        make_filemenu_button();
        make_location(ww);
-       NavBar->resizable(Location);
+       NavBar->resizable(LocationGroup);
        make_progress_bars(0,1);
       NavBar->box(FL_THIN_UP_FRAME);
       NavBar->end();
@@ -581,7 +585,7 @@ void UI::make_panel(int ww)
         p_xpos = 0;
         make_filemenu_button();
         make_location(ww);
-        LocBar->resizable(Location);
+        LocBar->resizable(LocationGroup);
        LocBar->end();
        LocBar->rearrange();
        TopGroup->insert(*LocBar,0);
@@ -945,6 +949,8 @@ void UI::customize()
       Tools->hide();
    if ( !prefs.show_clear_url )
       Clear->hide();
+   if ( !prefs.show_url )
+      Location->hide();
    if ( !prefs.show_search )
       Search->hide();
    if ( !prefs.show_help )
diff --git a/src/ui.hh b/src/ui.hh
index b924fff1..e345cde9 100644
--- a/src/ui.hh
+++ b/src/ui.hh
@@ -129,7 +129,7 @@ class UI : public CustGroupVertical {
    CustGroupHorizontal *LocBar, *NavBar, *StatusBar;
    Fl_Input *Location;
    CustProgressBox *PProg, *IProg;
-   Fl_Group *Panel, *Main;
+   Fl_Group *Panel, *Main, *LocationGroup;
    Fl_Output *StatusOutput;
    Findbar *FindBar;