Mercurial > octave
changeset 19918:66928b4546ab
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
author | Torsten <ttl@justmail.de> |
---|---|
date | Sun, 08 Mar 2015 14:00:18 +0100 |
parents | f48e650a68b5 |
children | 09cb7e1e46d1 |
files | libgui/src/icons/widget-close-light.png libgui/src/icons/widget-close-light.svg libgui/src/icons/widget-close.png libgui/src/icons/widget-close.svg libgui/src/icons/widget-dock-light.png libgui/src/icons/widget-dock-light.svg libgui/src/icons/widget-dock.png libgui/src/icons/widget-dock.svg libgui/src/icons/widget-undock-light.png libgui/src/icons/widget-undock-light.svg libgui/src/icons/widget-undock.png libgui/src/icons/widget-undock.svg libgui/src/octave-dock-widget.cc libgui/src/octave-dock-widget.h |
diffstat | 14 files changed, 541 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- /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 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + version="1.1" + width="32" + height="32" + id="svg2" + inkscape:version="0.48.4 r9939" + sodipodi:docname="widget-close-light.svg"> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1217" + inkscape:window-height="737" + id="namedview7" + showgrid="true" + inkscape:zoom="13.632822" + inkscape:cx="17.746364" + inkscape:cy="1.4474508" + inkscape:window-x="-1" + inkscape:window-y="34" + inkscape:window-maximized="0" + inkscape:current-layer="svg2"> + <inkscape:grid + type="xygrid" + id="grid2984" + empspacing="5" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" /> + </sodipodi:namedview> + <metadata + id="metadata8"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs6" /> + <path + d="M 25,25 7,7" + id="path2989" + style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + id="path2985" + d="M 25,7 7,25" /> +</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 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + version="1.1" + width="32" + height="32" + id="svg2" + inkscape:version="0.48.4 r9939" + sodipodi:docname="widget-close.svg"> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1217" + inkscape:window-height="737" + id="namedview7" + showgrid="true" + inkscape:zoom="13.632822" + inkscape:cx="17.746364" + inkscape:cy="17.927867" + inkscape:window-x="-1" + inkscape:window-y="34" + inkscape:window-maximized="0" + inkscape:current-layer="svg2"> + <inkscape:grid + type="xygrid" + id="grid2984" + empspacing="5" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" /> + </sodipodi:namedview> + <metadata + id="metadata8"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs6" /> + <path + d="M 25,25 7,7" + id="path2989" + style="fill:none;stroke:#141414;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + <path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + style="fill:none;stroke:#141414;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + id="path2985" + d="M 25,7 7,25" /> +</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 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + version="1.1" + width="32" + height="32" + id="svg2" + inkscape:version="0.48.4 r9939" + sodipodi:docname="widget-dock-light.svg"> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1080" + inkscape:window-height="731" + id="namedview11" + showgrid="true" + inkscape:zoom="14.648618" + inkscape:cx="19.259858" + inkscape:cy="16.85961" + inkscape:window-x="0" + inkscape:window-y="24" + inkscape:window-maximized="0" + inkscape:current-layer="g3792"> + <inkscape:grid + type="xygrid" + id="grid2988" + empspacing="5" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" /> + </sodipodi:namedview> + <metadata + id="metadata8"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs6" /> + <g + transform="translate(-7.7007624,-11.348432)" + id="g3792" + style="stroke-linecap:square;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke:#141414;stroke-opacity:1"> + <rect + width="22.000002" + height="23.000002" + rx="0.2512264" + ry="0.0025005043" + x="12.700763" + y="15.616543" + id="rect3794" + style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.50000000000000000;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + width="22" + height="2.0000005" + rx="0.2512264" + ry="0.0025005043" + x="12.700763" + y="15.616543" + id="rect3796" + style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.50000000000000000;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + </g> + <path + d="M 14,4.2681109 14,27.268111" + id="path3800" + style="fill:none;stroke:#ffffff;stroke-width:1.50000000000000000;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + <path + d="m 14,17.268111 13,0" + id="path3804" + style="fill:none;stroke:#ffffff;stroke-width:1.50000000000000000;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> +</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 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + version="1.1" + width="32" + height="32" + id="svg2" + inkscape:version="0.48.4 r9939" + sodipodi:docname="widget-dock.svg"> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1080" + inkscape:window-height="731" + id="namedview11" + showgrid="true" + inkscape:zoom="18.044858" + inkscape:cx="19.259858" + inkscape:cy="17.962102" + inkscape:window-x="126" + inkscape:window-y="24" + inkscape:window-maximized="0" + inkscape:current-layer="g3792"> + <inkscape:grid + type="xygrid" + id="grid2988" + empspacing="5" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" /> + </sodipodi:namedview> + <metadata + id="metadata8"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs6" /> + <g + transform="translate(-7.7007624,-11.348432)" + id="g3792" + style="stroke-linecap:square;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke:#141414;stroke-opacity:1"> + <rect + width="22.000002" + height="23.000002" + rx="0.2512264" + ry="0.0025005043" + x="12.700763" + y="15.736354" + id="rect3794" + style="color:#000000;fill:none;stroke:#141414;stroke-width:1.5;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + width="22" + height="2.0000005" + rx="0.2512264" + ry="0.0025005043" + x="12.700763" + y="15.736354" + id="rect3796" + style="color:#000000;fill:#141414;fill-opacity:1;stroke:#141414;stroke-width:1.5;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + </g> + <path + d="M 14,4.3879221 14,27.387922" + id="path3800" + style="fill:none;stroke:#141414;stroke-width:1.5;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + <path + d="m 14,17.387922 13,0" + id="path3804" + style="fill:none;stroke:#141414;stroke-width:1.5;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> +</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 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + version="1.1" + width="32" + height="32" + id="svg2" + inkscape:version="0.48.4 r9939" + sodipodi:docname="widget-undock-light.svg"> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="640" + inkscape:window-height="480" + id="namedview5953" + showgrid="false" + inkscape:zoom="9.4204102" + inkscape:cx="16" + inkscape:cy="16" + inkscape:window-x="0" + inkscape:window-y="24" + inkscape:window-maximized="0" + inkscape:current-layer="g3792" /> + <metadata + id="metadata8"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs6" /> + <g + transform="translate(-7.2158478,-11.926544)" + id="g3792" + style="stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"> + <rect + width="15.999999" + height="15" + rx="0.2512264" + ry="0.0025005043" + x="12.215848" + y="24.291922" + id="rect3794" + style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.50000000000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + width="16" + height="1.9999998" + rx="0.2512264" + ry="0.0025005043" + x="12.215848" + y="24.291922" + id="rect3796" + style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.50000000000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + width="16" + height="1.9999998" + rx="0.2512264" + ry="0.0025005043" + x="18.215847" + y="16.291922" + id="rect2988" + style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.50000000000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + </g> + <path + d="m 11,4.3653773 0,9.9999997" + id="path3800" + style="fill:none;stroke:#ffffff;stroke-width:1.50000000000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + <path + d="m 21,19.365377 6,0 0,-14.9999997" + id="path3804" + style="fill:none;stroke:#ffffff;stroke-width:1.50000000000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> +</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 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + version="1.1" + width="32" + height="32" + id="svg2" + inkscape:version="0.48.4 r9939" + sodipodi:docname="widget-undock.svg"> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1105" + inkscape:window-height="720" + id="namedview3783" + showgrid="true" + inkscape:zoom="16.421381" + inkscape:cx="24.012447" + inkscape:cy="16.356858" + inkscape:window-x="0" + inkscape:window-y="24" + inkscape:window-maximized="0" + inkscape:current-layer="g3792"> + <inkscape:grid + type="xygrid" + id="grid3785" + empspacing="5" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" /> + </sodipodi:namedview> + <metadata + id="metadata8"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs6" /> + <g + transform="translate(-7.2158478,-11.926544)" + id="g3792" + style="stroke:#141414;stroke-opacity:1;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"> + <rect + width="15.999999" + height="15" + rx="0.2512264" + ry="0.0025005043" + x="12.215848" + y="24.291922" + id="rect3794" + style="color:#000000;fill:none;stroke:#141414;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + width="16" + height="1.9999998" + rx="0.2512264" + ry="0.0025005043" + x="12.215848" + y="24.291922" + id="rect3796" + style="color:#000000;fill:#141414;fill-opacity:1;stroke:#141414;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + width="16" + height="1.9999998" + rx="0.2512264" + ry="0.0025005043" + x="18.215847" + y="16.291922" + id="rect2988" + style="color:#000000;fill:#141414;fill-opacity:1;stroke:#141414;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + </g> + <path + d="m 11,4.3653773 0,9.9999997" + id="path3800" + style="fill:none;stroke:#141414;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /> + <path + d="m 21,19.365377 6,0 0,-14.9999997" + id="path3804" + style="fill:none;stroke:#141414;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccc" /> +</svg>
--- 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 <QHBoxLayout> #include <QLabel> #include <QSettings> +#include <QStyle> #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 }