diff options
| author | Jabiertxo Arraiza Cenoz <jtx@jtx-desktop.markerlab.es> | 2017-12-27 17:05:55 +0000 |
|---|---|---|
| committer | Jabiertxo Arraiza Cenoz <jtx@jtx-desktop.markerlab.es> | 2017-12-27 17:05:55 +0000 |
| commit | 76aab6da8d642a2e72c0a8e0f38c6994a6e62b35 (patch) | |
| tree | 047c4f9d208f8cf8b647acec494a2bb7a5d160ec /src/widgets/toolbox.cpp | |
| parent | Merge branch 'master' into powerpencilII (diff) | |
| parent | Stop using deprecated gtk_adjustment_value_changed (diff) | |
| download | inkscape-76aab6da8d642a2e72c0a8e0f38c6994a6e62b35.tar.gz inkscape-76aab6da8d642a2e72c0a8e0f38c6994a6e62b35.zip | |
Merge branch 'master' into powerpencilII
Diffstat (limited to 'src/widgets/toolbox.cpp')
| -rw-r--r-- | src/widgets/toolbox.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
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){ |