# HG changeset patch # User Torsten # Date 1425819618 -3600 # Node ID 66928b4546ab5e792750f41126ea92a71c98b0a1 # Parent f48e650a68b5684dfa2d2182193d70fa8c116fc0 dock-/undock- and close-icons with variable size (bug #41938) * widget-close-light.png, widget-close.png, widget-dock-light.png, widget-dock.png, widget-undock-light.png, widget-undock.png * widget-close-light.svg, widget-close.svg, widget-dock-light.svg, widget-dock.svg, widget-undock-light.svg, widget-undock.svg * octave-dock-widget.cc (octave_dock_widget): derive icon size from the small icon size that suits the actual qt style * octave-dock-widget.h: new class variable storing the icon size diff -r f48e650a68b5 -r 66928b4546ab libgui/src/icons/widget-close-light.png Binary file libgui/src/icons/widget-close-light.png has changed diff -r f48e650a68b5 -r 66928b4546ab libgui/src/icons/widget-close-light.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libgui/src/icons/widget-close-light.svg Sun Mar 08 14:00:18 2015 +0100 @@ -0,0 +1,72 @@ + + + + diff -r f48e650a68b5 -r 66928b4546ab libgui/src/icons/widget-close.png Binary file libgui/src/icons/widget-close.png has changed diff -r f48e650a68b5 -r 66928b4546ab libgui/src/icons/widget-close.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libgui/src/icons/widget-close.svg Sun Mar 08 14:00:18 2015 +0100 @@ -0,0 +1,72 @@ + + + + diff -r f48e650a68b5 -r 66928b4546ab libgui/src/icons/widget-dock-light.png Binary file libgui/src/icons/widget-dock-light.png has changed diff -r f48e650a68b5 -r 66928b4546ab libgui/src/icons/widget-dock-light.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libgui/src/icons/widget-dock-light.svg Sun Mar 08 14:00:18 2015 +0100 @@ -0,0 +1,95 @@ + + + + diff -r f48e650a68b5 -r 66928b4546ab libgui/src/icons/widget-dock.png Binary file libgui/src/icons/widget-dock.png has changed diff -r f48e650a68b5 -r 66928b4546ab libgui/src/icons/widget-dock.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libgui/src/icons/widget-dock.svg Sun Mar 08 14:00:18 2015 +0100 @@ -0,0 +1,95 @@ + + + + diff -r f48e650a68b5 -r 66928b4546ab libgui/src/icons/widget-undock-light.png Binary file libgui/src/icons/widget-undock-light.png has changed diff -r f48e650a68b5 -r 66928b4546ab libgui/src/icons/widget-undock-light.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libgui/src/icons/widget-undock-light.svg Sun Mar 08 14:00:18 2015 +0100 @@ -0,0 +1,92 @@ + + + + diff -r f48e650a68b5 -r 66928b4546ab libgui/src/icons/widget-undock.png Binary file libgui/src/icons/widget-undock.png has changed diff -r f48e650a68b5 -r 66928b4546ab libgui/src/icons/widget-undock.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libgui/src/icons/widget-undock.svg Sun Mar 08 14:00:18 2015 +0100 @@ -0,0 +1,104 @@ + + + + diff -r f48e650a68b5 -r 66928b4546ab libgui/src/octave-dock-widget.cc --- a/libgui/src/octave-dock-widget.cc Sun Mar 08 05:53:11 2015 -0700 +++ b/libgui/src/octave-dock-widget.cc Sun Mar 08 14:00:18 2015 +0100 @@ -31,6 +31,7 @@ #include #include #include +#include #include "resource-manager.h" #include "octave-dock-widget.h" @@ -52,6 +53,9 @@ connect (p, SIGNAL (active_dock_changed (octave_dock_widget*, octave_dock_widget*)), this, SLOT (handle_active_dock_changed (octave_dock_widget*, octave_dock_widget*))); + QStyle *st = style (); + _icon_size = 0.75*st->pixelMetric (QStyle::PM_SmallIconSize); + #if defined (Q_OS_WIN32) // windows: add an extra title bar that persists when floating @@ -66,7 +70,7 @@ _dock_button = new QToolButton (this); _dock_button->setDefaultAction (_dock_action); _dock_button->setFocusPolicy (Qt::NoFocus); - _dock_button->setIconSize (QSize (12,12)); + _dock_button->setIconSize (QSize (_icon_size,_icon_size)); _close_action = new QAction (QIcon (":/actions/icons/widget-close.png"), "", this); @@ -76,7 +80,7 @@ _close_button = new QToolButton (this); _close_button->setDefaultAction (_close_action); _close_button->setFocusPolicy (Qt::NoFocus); - _close_button->setIconSize (QSize (12,12)); + _close_button->setIconSize (QSize (_icon_size,_icon_size)); _icon_color = ""; _title_3d = 50; @@ -346,10 +350,9 @@ " titlebar-close-icon: url(:/actions/icons/widget-close%2.png);" " titlebar-normal-icon: url(:/actions/icons/"+dock_icon+"%2); }" "QDockWidget::close-button," - "QDockWidget::float-button { border: 0px;}" + "QDockWidget::float-button { border: 0px; icon-size: %3px; width: %3px}" ). - arg (fg_col.name ()). - arg (icon_col); + arg (fg_col.name ()).arg (icon_col).arg (_icon_size); #endif } else @@ -363,8 +366,8 @@ " titlebar-close-icon: url(:/actions/icons/widget-close.png);" " titlebar-normal-icon: url(:/actions/icons/"+dock_icon+"); }" "QDockWidget::close-button," - "QDockWidget::float-button { border: 0px; }" - ); + "QDockWidget::float-button { border: 0px; icon-size: %1px; width: %1px}" + ).arg (_icon_size); #endif } diff -r f48e650a68b5 -r 66928b4546ab libgui/src/octave-dock-widget.h --- a/libgui/src/octave-dock-widget.h Sun Mar 08 05:53:11 2015 -0700 +++ b/libgui/src/octave-dock-widget.h Sun Mar 08 14:00:18 2015 +0100 @@ -123,6 +123,7 @@ bool _floating; bool _custom_style; int _title_3d; + int _icon_size; QColor _bg_color; QColor _bg_color_active; QColor _fg_color;