Merge with "Beep6581/dev"
This commit is contained in:
@@ -38,6 +38,7 @@ ToolVBox::ToolVBox() {
|
||||
|
||||
ToolParamBlock::ToolParamBlock() {
|
||||
set_orientation(Gtk::ORIENTATION_VERTICAL);
|
||||
get_style_context()->add_class("ToolParamBlock");
|
||||
//GTK318
|
||||
#if GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION < 20
|
||||
set_spacing(2); // Vertical space between parameters in a single tool
|
||||
@@ -73,7 +74,15 @@ FoldableToolPanel::FoldableToolPanel(Gtk::Box* content, Glib::ustring toolName,
|
||||
exp->signal_button_release_event().connect_notify( sigc::mem_fun(this, &FoldableToolPanel::foldThemAll) );
|
||||
enaConn = signal_enabled_toggled().connect( sigc::mem_fun(*this, &FoldableToolPanel::enabled_toggled) );
|
||||
|
||||
exp->add (*content);
|
||||
Gtk::Box *expanderContents = Gtk::manage(
|
||||
new Gtk::Box(Gtk::Orientation::ORIENTATION_VERTICAL));
|
||||
subToolsContainer = Gtk::manage(new ToolParamBlock());
|
||||
subToolsContainer->get_style_context()->add_class("SubToolsContainer");
|
||||
expanderContents->get_style_context()->add_class("ExpanderContents");
|
||||
expanderContents->pack_start(*content, false, false, 0);
|
||||
expanderContents->pack_start(*subToolsContainer, false, false, 0);
|
||||
|
||||
exp->add(*expanderContents, false);
|
||||
exp->show ();
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user