diff options
| -rw-r--r-- | src/ui/dialog/symbols.cpp | 20 | ||||
| -rw-r--r-- | src/widgets/toolbox.cpp | 16 |
2 files changed, 32 insertions, 4 deletions
diff --git a/src/ui/dialog/symbols.cpp b/src/ui/dialog/symbols.cpp index 1642ff04c..108d186ab 100644 --- a/src/ui/dialog/symbols.cpp +++ b/src/ui/dialog/symbols.cpp @@ -114,8 +114,15 @@ SymbolsDialog::SymbolsDialog( gchar const* prefsPath ) : /******************** Table *************************/ auto table = new Gtk::Grid(); + +#if GTKMM_CHECK_VERSION(3,12,0) + table->set_margin_start(3); + table->set_margin_end(3); +#else table->set_margin_left(3); table->set_margin_right(3); +#endif + table->set_margin_top(4); // panel is a cloked Gtk::VBox _getContents()->pack_start(*Gtk::manage(table), Gtk::PACK_EXPAND_WIDGET); @@ -154,8 +161,15 @@ SymbolsDialog::SymbolsDialog( gchar const* prefsPath ) : search->set_tooltip_text(_("Return to start search.")); search->signal_key_press_event().connect_notify( sigc::mem_fun(*this, &SymbolsDialog::beforeSearch)); search->signal_key_release_event().connect_notify(sigc::mem_fun(*this, &SymbolsDialog::unsensitive)); + +#if GTKMM_CHECK_VERSION(3,12,0) + search->set_margin_start(10); + search->set_margin_end(10); +#else search->set_margin_left(10); search->set_margin_right(10); +#endif + search->set_margin_bottom(6); search->signal_search_changed().connect(sigc::mem_fun(*this, &SymbolsDialog::clearSearch)); table->attach(*Gtk::manage(search),0,row,2,1); @@ -237,8 +251,14 @@ SymbolsDialog::SymbolsDialog( gchar const* prefsPath ) : progress->pack_start(* progress_bar, Gtk::PACK_EXPAND_WIDGET); progress->set_margin_top(15); progress->set_margin_bottom(15); + +#if GTKMM_CHECK_VERSION(3,12,0) + progress->set_margin_start(20); + progress->set_margin_end(20); +#else progress->set_margin_left(20); progress->set_margin_right(20); +#endif ++row; diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index 447af9c71..11be3b15d 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -1038,11 +1038,19 @@ void setup_aux_toolbox(GtkWidget *toolbox, SPDesktop *desktop) swatch->setDesktop( desktop ); swatch->setClickVerb( aux_toolboxes[i].swatch_verb_id ); swatch->setWatchedTool( aux_toolboxes[i].swatch_tool, true ); + +#if GTKMM_CHECK_VERSION(3,12,0) + swatch->set_margin_start(AUX_BETWEEN_BUTTON_GROUPS); + swatch->set_margin_end(AUX_BETWEEN_BUTTON_GROUPS); +#else + swatch->set_margin_left(AUX_BETWEEN_BUTTON_GROUPS); + swatch->set_margin_right(AUX_BETWEEN_BUTTON_GROUPS); +#endif + + swatch->set_margin_top(AUX_SPACING); + swatch->set_margin_bottom(AUX_SPACING); + auto swatch_ = GTK_WIDGET( swatch->gobj() ); - gtk_widget_set_margin_left(swatch_, AUX_BETWEEN_BUTTON_GROUPS); - gtk_widget_set_margin_right(swatch_, AUX_BETWEEN_BUTTON_GROUPS); - gtk_widget_set_margin_top(swatch_, AUX_SPACING); - gtk_widget_set_margin_bottom(swatch_, AUX_SPACING); gtk_grid_attach( GTK_GRID(holder), swatch_, 1, 0, 1, 1); } if(i==0){ |