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

Bugfix: the scrollable toolbars was freezing under some circumstances

Browse Source
This commit is contained in:
Hombre
2018-09-06 23:10:16 +02:00
parent fb17b6be9f
commit caffc3a23d
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
rtgui/guiutils.cc
View File

@@ -991,8 +991,11 @@ void MyScrolledWindow::get_preferred_height_for_width_vfunc (int width, int &min
MyScrolledToolbar::MyScrolledToolbar ()
{
set_policy (Gtk::POLICY_EXTERNAL, Gtk::POLICY_NEVER);
set_propagate_natural_height(true);
get_style_context()->add_class("scrollableToolbar");
// Works fine with Gtk 3.22, but a a custom made get_preferred_height had to be created as a workaround
// taken from the official Gtk3.22 source code
//set_propagate_natural_height(true);
}
bool MyScrolledToolbar::on_scroll_event (GdkEventScroll* event)
@@ -1032,6 +1035,23 @@ bool MyScrolledToolbar::on_scroll_event (GdkEventScroll* event)
return true;
}
void MyScrolledToolbar::get_preferred_height (int &minimumHeight, int &naturalHeight)
{
int currMinHeight = 0;
int currNatHeight = 0;
std::vector<Widget*> childs = get_children();
minimumHeight = naturalHeight = 0;
for (auto child : childs)
{
if(child->is_visible()) {
child->get_preferred_height(currMinHeight, currNatHeight);
minimumHeight = rtengine::max(currMinHeight, minimumHeight);
naturalHeight = rtengine::max(currNatHeight, naturalHeight);
}
}
}
MyComboBoxText::MyComboBoxText (bool has_entry) : Gtk::ComboBoxText(has_entry)
{
minimumWidth = naturalWidth = 70;