ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Pack Color Theme Manager as Box - consistent spacing

Browse Source
This commit is contained in:
Robin Gareus 2016-12-28 16:51:24 +01:00
parent d49b141e11
commit 9b9cb4beaa
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gtk2_ardour/color_theme_manager.cc
View File

@ -61,7 +61,7 @@ ColorThemeManager::ColorThemeManager ()
, palette_window (0) , palette_window (0)
, color_theme_label (_("Color Theme")) , color_theme_label (_("Color Theme"))
{ {
set_spacing (12); _box->set_spacing (12);
std::map<string,string> color_themes; std::map<string,string> color_themes;
@ -105,7 +105,7 @@ ColorThemeManager::ColorThemeManager ()
hbox->set_spacing (6); hbox->set_spacing (6);
hbox->pack_start (color_theme_label, false, false); hbox->pack_start (color_theme_label, false, false);
hbox->pack_start (*align, true, true); hbox->pack_start (*align, true, true);
pack_start (*hbox, PACK_SHRINK); _box->pack_start (*hbox, PACK_SHRINK);
hbox->show_all (); hbox->show_all ();
} }
@ -146,8 +146,8 @@ ColorThemeManager::ColorThemeManager ()
notebook.set_size_request (400, 400); notebook.set_size_request (400, 400);
pack_start (notebook, true, true); _box->pack_start (notebook, true, true);
pack_start (reset_button, false, false); _box->pack_start (reset_button, false, false);
color_dialog.get_colorsel()->set_has_opacity_control (true); color_dialog.get_colorsel()->set_has_opacity_control (true);
color_dialog.get_colorsel()->set_has_palette (true); color_dialog.get_colorsel()->set_has_palette (true);
@ -162,7 +162,7 @@ ColorThemeManager::ColorThemeManager ()
UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &ColorThemeManager::colors_changed)); UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &ColorThemeManager::colors_changed));
show_all (); _box->show_all ();
} }
@ -603,12 +603,6 @@ ColorThemeManager::set_state_from_config ()
} }
void
ColorThemeManager::add_to_page (OptionEditorPage* page)
{
add_widget_to_page (page, this);
}
Gtk::Widget& Gtk::Widget&
ColorThemeManager::tip_widget() ColorThemeManager::tip_widget()
{ {

5
gtk2_ardour/color_theme_manager.h
View File

@ -39,7 +39,7 @@ namespace ArdourCanvas {
class ArdourDialog; class ArdourDialog;
class ColorThemeManager : public Gtk::VBox, public OptionEditorComponent class ColorThemeManager : public OptionEditorBox
{ {
public: public:
ColorThemeManager(); ColorThemeManager();
@ -56,9 +56,6 @@ class ColorThemeManager : public Gtk::VBox, public OptionEditorComponent
/** Called to instruct the object to set its UI state from the configuration */ /** Called to instruct the object to set its UI state from the configuration */
void set_state_from_config (); void set_state_from_config ();
/** Called to instruct the object to add itself to an OptionEditorPage */
void add_to_page (OptionEditorPage *);
void set_note (std::string const &); void set_note (std::string const &);
Gtk::Widget& tip_widget(); Gtk::Widget& tip_widget();