liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Issue #3446: Updated Gtk3.18 theme

Browse Source 
Harcoded style has been reintroduced for Gtk < 3.20 only ; a cleanup
will have to be done once Gtk3.18 support will be dropped.
This commit is contained in:
Hombre57
2016-12-06 01:33:03 +01:00
parent 8094ce7c99
commit f3f317e5bd
8 changed files with 243 additions and 408 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
rtgui/guiutils.cc
View File

@@ -506,6 +506,11 @@ bool ExpanderBox::on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr) {
ExpanderBox::ExpanderBox( Gtk::Container *p): pC(p)
{
set_name ("ExpanderBox");
//GTK318
#if GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION < 20
set_border_width(2);
#endif
//GTK318
}
void ExpanderBox::setLevel(int level)
@@ -586,6 +591,11 @@ MyExpander::MyExpander(bool useEnabled, Gtk::Widget* titleWidget) :
pack_start(*titleEvBox, Gtk::PACK_EXPAND_WIDGET, 0);
//GTK318
#if GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION < 20
updateStyle();
#endif
//GTK318
titleEvBox->signal_button_release_event().connect( sigc::mem_fun(this, & MyExpander::on_toggle) );
titleEvBox->signal_enter_notify_event().connect( sigc::mem_fun(this, & MyExpander::on_enter_leave_title), false);
titleEvBox->signal_leave_notify_event().connect( sigc::mem_fun(this, & MyExpander::on_enter_leave_title), false);
@@ -641,6 +651,11 @@ MyExpander::MyExpander(bool useEnabled, Glib::ustring titleLabel) :
pack_start(*titleEvBox, Gtk::PACK_EXPAND_WIDGET, 0);
//GTK318
#if GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION < 20
updateStyle();
#endif
//GTK318
titleEvBox->signal_button_release_event().connect( sigc::mem_fun(this, & MyExpander::on_toggle));
titleEvBox->signal_enter_notify_event().connect( sigc::mem_fun(this, & MyExpander::on_enter_leave_title), false);
titleEvBox->signal_leave_notify_event().connect( sigc::mem_fun(this, & MyExpander::on_enter_leave_title), false);
@@ -676,6 +691,18 @@ bool MyExpander::on_enter_leave_enable (GdkEventCrossing* event)
return true;
}
//GTK318
#if GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION < 20
void MyExpander::updateStyle()
{
headerHBox->set_spacing(2);
headerHBox->set_border_width(1);
set_spacing(0);
set_border_width(0);
}
#endif
//GTK318
void MyExpander::setLevel (int level)
{
if (expBox) {