Mercurial > octave
diff libgui/src/main-window.cc @ 19847:597fc0fd8e54
make size of toolbar icons depending on scaling of display
* files-dock-widget.cc (notice_settings): set icon size to small, normal or
large by using qt pixel metrics
* file-editor.cc notice_settings): set icon size to small, normal or
large by using qt pixel metrics
* main-window.cc (notice_settings): set icon size to small, normal or
large by using qt pixel metrics
* settings-dialog.ui: use radio buttons for small, normal and large icon
size instead of spin box with pixel sizes
* settings-dialog.cc (settings_dialog): initialize the radio buttons depending
on the settings file;
(write_changed_settings): save the icon size depending on radio buttons
| author | Torsten <ttl@justmail.de> |
|---|---|
| date | Tue, 24 Feb 2015 09:35:34 +0100 |
| parents | 72fe9df87fe8 |
| children | a59c5a16c9ab |
line wrap: on
line diff
--- a/libgui/src/main-window.cc Tue Feb 24 07:12:13 2015 +0100 +++ b/libgui/src/main-window.cc Tue Feb 24 09:35:34 2015 +0100 @@ -731,7 +731,15 @@ else _release_notes_icon = ":/actions/icons/logo.png"; - int icon_size = settings->value ("toolbar_icon_size",16).toInt (); + int icon_size_settings = settings->value ("toolbar_icon_size",0).toInt (); + QStyle *st = style (); + int icon_size = st->pixelMetric (QStyle::PM_ToolBarIconSize); + + if (icon_size_settings == 1) + icon_size = st->pixelMetric (QStyle::PM_LargeIconSize); + else if (icon_size_settings == -1) + icon_size = st->pixelMetric (QStyle::PM_SmallIconSize); + _main_tool_bar->setIconSize (QSize (icon_size,icon_size)); if (settings->value ("show_status_bar",true).toBool ())