From e6aff9cbf74d57a7f20966326a1a2ad388230382 Mon Sep 17 00:00:00 2001 From: Hombre Date: Mon, 12 Dec 2016 01:18:27 +0100 Subject: [PATCH] Tweaked some space here and there, thanks to Beep6581 (issue #3446) --- rtdata/themes/RawTherapee-GTK3-20_.css | 44 +++++++++++++++++++++++--- rtgui/editorpanel.cc | 7 ++-- rtgui/editorpanel.h | 4 +-- rtgui/profilepanel.cc | 2 -- 4 files changed, 47 insertions(+), 10 deletions(-) diff --git a/rtdata/themes/RawTherapee-GTK3-20_.css b/rtdata/themes/RawTherapee-GTK3-20_.css index 30c575689..4417d2d7b 100644 --- a/rtdata/themes/RawTherapee-GTK3-20_.css +++ b/rtdata/themes/RawTherapee-GTK3-20_.css @@ -80,7 +80,7 @@ frame { border-radius: 0; border-style: solid; /*border-style: none none none solid;*/ - padding: 0 3px; + padding: 0; margin: 3px 0 ; background-color: rgba(0,0,0,0.); } @@ -360,11 +360,12 @@ menuitem { } #HistogramPanel { - margin: 2px 4px; + margin: 0; + padding: 0; } #MyExpander { - margin: 0 5px 0 5px; + margin: 0; padding: 0; } @@ -585,10 +586,27 @@ paned box, paned grid { } paned > separator { - border: 1px solid #484848; + border-width: 1px; + border-color: #484848; margin: 0; padding: 0; } +paned.horizontal > separator { + min-width: 2px; + border-style: none solid; +} +paned.vertical > separator { + min-height: 2px; + border-style: solid none; +} + +#PlacesPaned { + padding: 0px 0px 5px 5px; +} +#PlacesPaned:first-child { + padding: 0; + margin: 2px 0 4px 4px; +} #MainNotebook > header.left tab image { margin: 0.5em 0 0 0; @@ -606,6 +624,8 @@ paned > separator { #MainNotebook header { /* OK */ background-color: #2A2A2A; + border: 0; + padding: 0; } #MainNotebook tabs { /* OK */ @@ -752,6 +772,18 @@ paned > separator { padding: 5px; } +#EditorLeftPaned:first-child { + padding: 0 0 0 3px; +} + +#EditorLeftPaned:last-child { + padding: 10px 0 0 10px; +} + +#EditorRightPaned:last-child { + padding: 0 4px 0 0; +} + #MainNotebook > header #CloseButton { padding: 0; margin: 0 0 0 0.3em; @@ -760,3 +792,7 @@ paned > separator { padding: 0; margin: 0; } + +#RightNotebook #ToolPanelNotebook stack { + margin: 4px; +} diff --git a/rtgui/editorpanel.cc b/rtgui/editorpanel.cc index 3e15ad31f..ef14ef876 100644 --- a/rtgui/editorpanel.cc +++ b/rtgui/editorpanel.cc @@ -326,6 +326,7 @@ EditorPanel::EditorPanel (FilePanel* filePanel) profilep = Gtk::manage (new ProfilePanel ()); ppframe = new Gtk::Frame (); + ppframe->set_name("ProfilePanel"); ppframe->add (*profilep); ppframe->set_label (M ("PROFILEPANEL_LABEL")); //leftbox->pack_start (*ppframe, Gtk::PACK_SHRINK, 4); @@ -559,8 +560,10 @@ EditorPanel::EditorPanel (FilePanel* filePanel) editbox->show_all (); // build screen - hpanedl = Gtk::manage (new Gtk::HPaned()); - hpanedr = Gtk::manage (new Gtk::HPaned()); + hpanedl = Gtk::manage (new Gtk::Paned(Gtk::ORIENTATION_HORIZONTAL)); + hpanedl->set_name("EditorLeftPaned"); + hpanedr = Gtk::manage (new Gtk::Paned(Gtk::ORIENTATION_HORIZONTAL)); + hpanedr->set_name("EditorRightPaned"); leftbox->reference (); vboxright->reference (); diff --git a/rtgui/editorpanel.h b/rtgui/editorpanel.h index 24d5fa0fa..9ec7da58d 100644 --- a/rtgui/editorpanel.h +++ b/rtgui/editorpanel.h @@ -67,8 +67,8 @@ protected: Gtk::ToggleButton* tbBeforeLock; //bool bAllSidePanelsVisible; Gtk::ToggleButton* beforeAfter; - Gtk::HPaned* hpanedl; - Gtk::HPaned* hpanedr; + Gtk::Paned* hpanedl; + Gtk::Paned* hpanedr; Gtk::Image *iHistoryShow, *iHistoryHide; Gtk::Image *iTopPanel_1_Show, *iTopPanel_1_Hide; Gtk::Image *iRightPanel_1_Show, *iRightPanel_1_Hide; diff --git a/rtgui/profilepanel.cc b/rtgui/profilepanel.cc index 7f7948d01..939739805 100644 --- a/rtgui/profilepanel.cc +++ b/rtgui/profilepanel.cc @@ -42,8 +42,6 @@ void ProfilePanel::cleanup () ProfilePanel::ProfilePanel () : storedPProfile(nullptr), lastFilename(""), imagePath("") { - set_name("ProfilePanel"); - tpc = nullptr; profileFillModeOnImage = new RTImage("profile-filled.png");