diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2017-06-29 13:28:54 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marc@jeanmougin.fr> | 2017-06-29 13:28:54 +0000 |
| commit | 88e5cefd2b64d56aa00009f91d9c481c9b8c3c74 (patch) | |
| tree | 901357ee4a10db7a130c7c591e2fe85ee32bc931 /src/widgets/desktop-widget.cpp | |
| parent | glade WIP (diff) | |
| parent | Hackfest icon work: restore selected menu icons and make theming easier (diff) | |
| download | inkscape-88e5cefd2b64d56aa00009f91d9c481c9b8c3c74.tar.gz inkscape-88e5cefd2b64d56aa00009f91d9c481c9b8c3c74.zip | |
Merge branch 'master' of gitlab.com:inkscape/inkscape
Diffstat (limited to 'src/widgets/desktop-widget.cpp')
| -rw-r--r-- | src/widgets/desktop-widget.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index ce4c5936c..2479fa453 100644 --- a/src/widgets/desktop-widget.cpp +++ b/src/widgets/desktop-widget.cpp @@ -351,7 +351,7 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) ToolboxFactory::setOrientation( dtw->tool_toolbox, GTK_ORIENTATION_VERTICAL ); gtk_box_pack_start( GTK_BOX(dtw->hbox), dtw->tool_toolbox, FALSE, TRUE, 0 ); // Lock guides button - dtw->guides_lock = sp_button_new_from_data( Inkscape::ICON_SIZE_DECORATION, + dtw->guides_lock = sp_button_new_from_data( GTK_ICON_SIZE_MENU, SP_BUTTON_TYPE_TOGGLE, NULL, INKSCAPE_ICON("object-locked"), @@ -410,7 +410,7 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) dtw->vscrollbar_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); // Sticky zoom button - dtw->sticky_zoom = sp_button_new_from_data ( Inkscape::ICON_SIZE_DECORATION, + dtw->sticky_zoom = sp_button_new_from_data ( GTK_ICON_SIZE_MENU, SP_BUTTON_TYPE_TOGGLE, NULL, INKSCAPE_ICON("zoom-original"), @@ -435,7 +435,7 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) tip = act->tip; } } - dtw->cms_adjust = sp_button_new_from_data( Inkscape::ICON_SIZE_DECORATION, + dtw->cms_adjust = sp_button_new_from_data( GTK_ICON_SIZE_MENU, SP_BUTTON_TYPE_TOGGLE, NULL, INKSCAPE_ICON("color-management"), @@ -543,7 +543,6 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw ) dtw->layer_selector = new Inkscape::Widgets::LayerSelector(NULL); // FIXME: need to unreference on container destruction to avoid leak dtw->layer_selector->reference(); - //dtw->layer_selector->set_size_request(-1, SP_ICON_SIZE_BUTTON); gtk_box_pack_start(GTK_BOX(dtw->statusbar), GTK_WIDGET(dtw->layer_selector->gobj()), FALSE, FALSE, 1); // Select Status |