From d8ad81c85c62adc4ecfefefb72699614d5d0067a Mon Sep 17 00:00:00 2001 From: Beep6581 Date: Sat, 21 Nov 2015 12:03:05 +0100 Subject: [PATCH] Shrunk down tab buttons, fixed selected text highlight, added hover and inactive adjuster button states, removed FileBrowser frame's padding which fixes bug #2948 and bug #2949 --- rtdata/themes/RawTherapee.css | 26 +++++++++++++++++++++----- rtgui/filecatalog.cc | 2 ++ 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/rtdata/themes/RawTherapee.css b/rtdata/themes/RawTherapee.css index 6b321ed36..6a6eb9fc0 100644 --- a/rtdata/themes/RawTherapee.css +++ b/rtdata/themes/RawTherapee.css @@ -46,6 +46,10 @@ GtkNotebook { padding: 4px 4px 4px 4px; } +.filebrowser GtkFrame { + padding: 0px; +} + /* Frames in the toolbox. Not MyExpander frames. */ GtkEventBox .frame { border-color: #565656; @@ -67,8 +71,6 @@ GtkEventBox .frame { padding: 4px; } - - .separator { color: #363636; } @@ -94,7 +96,7 @@ GtkImage { padding: 1px; } -/* Horizontal group of buttons in 1 column */ +/* Vertical group of buttons in 1 column */ GtkButton.Top { border-radius: 10px 4px 0 0; border-style: solid solid none solid; @@ -132,11 +134,25 @@ GtkButton.Right { } /* end */ +/* [1.23[-][+]] */ GtkEntry, GtkSpinButton { - padding: 1px 4px 0 1px; + padding: 1px 10px 0 1px; background-color: #262626; } +GtkEntry:insensitive, GtkSpinButton:insensitive { + background-color: #363636; +} + +GtkEntry:hover, GtkSpinButton:hover { + background-color: #565656; +} + +GtkEntry:selected { + color: #262626; + background-color: #AAAAAA; +} + /* Context menus */ GtkMenu { background-color: #262626; @@ -189,7 +205,7 @@ GtkNotebook tab { background-color: #404040; border: 1px solid #505050; border-radius: 4px; - padding: 5px; + padding: 3px; } GtkNotebook tab:hover { diff --git a/rtgui/filecatalog.cc b/rtgui/filecatalog.cc index 88edbe168..46d2c31e7 100644 --- a/rtgui/filecatalog.cc +++ b/rtgui/filecatalog.cc @@ -56,6 +56,7 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) : // construct and initialize thumbnail browsers fileBrowser = Gtk::manage( new FileBrowser() ); + fileBrowser->get_style_context()->add_class ("filebrowser"); fileBrowser->setFileBrowserListener (this); fileBrowser->setArrangement (ThumbBrowserBase::TB_Vertical); fileBrowser->show (); @@ -399,6 +400,7 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) : hBox = Gtk::manage( new Gtk::HBox () ); hBox->show (); hBox->pack_end (*fileBrowser); + hBox->get_style_context()->add_class ("filmstripPanel"); fileBrowser->applyFilter (getFilter()); // warning: can call this only after all objects used in getFilter (e.g. Query) are instantiated //printf("FileCatalog::FileCatalog fileBrowser->applyFilter (getFilter())\n"); pack_start (*hBox);