mirror of
https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System.git
synced 2025-01-24 05:22:06 +08:00
Added icon for proper styling of focused close icon
This commit is contained in:
Uwe Kindler
parent
227037e42a
commit
0227bd1786
@ -576,6 +576,7 @@ CMainWindow::CMainWindow(QWidget *parent) :
|
|||||||
|
|
||||||
//CDockManager::setConfigFlag(CDockManager::AlwaysShowTabs, true);
|
//CDockManager::setConfigFlag(CDockManager::AlwaysShowTabs, true);
|
||||||
CDockManager::setConfigFlag(CDockManager::FocusHighlighting, true);
|
CDockManager::setConfigFlag(CDockManager::FocusHighlighting, true);
|
||||||
|
CDockManager::setConfigFlag(CDockManager::AllTabsHaveCloseButton, true);
|
||||||
|
|
||||||
// Now create the dock manager and its content
|
// Now create the dock manager and its content
|
||||||
d->DockManager = new CDockManager(this);
|
d->DockManager = new CDockManager(this);
|
||||||
|
|||||||
@ -666,10 +666,7 @@ void CDockWidgetTab::setElideMode(Qt::TextElideMode mode)
|
|||||||
//============================================================================
|
//============================================================================
|
||||||
void CDockWidgetTab::updateStyle()
|
void CDockWidgetTab::updateStyle()
|
||||||
{
|
{
|
||||||
this->style()->unpolish(this);
|
internal::repolishStyle(this, internal::RepolishDirectChildren);
|
||||||
this->style()->polish(this);
|
|
||||||
d->TitleLabel->style()->unpolish(d->TitleLabel);
|
|
||||||
d->TitleLabel->style()->polish(d->TitleLabel);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -4,6 +4,6 @@
|
|||||||
<file>images/close-button.svg</file>
|
<file>images/close-button.svg</file>
|
||||||
<file>images/close-button-disabled.svg</file>
|
<file>images/close-button-disabled.svg</file>
|
||||||
<file>stylesheets/default_linux.css</file>
|
<file>stylesheets/default_linux.css</file>
|
||||||
<file>images/close-button2.svg</file>
|
<file>images/close-button-focused.svg</file>
|
||||||
</qresource>
|
</qresource>
|
||||||
</RCC>
|
</RCC>
|
||||||
|
|||||||
@ -121,7 +121,7 @@ void setButtonIcon(QAbstractButton* Button, QStyle::StandardPixmap StandarPixmap
|
|||||||
|
|
||||||
|
|
||||||
//============================================================================
|
//============================================================================
|
||||||
void repolishStyle(QWidget* w)
|
void repolishStyle(QWidget* w, eRepolishChildOptions Options)
|
||||||
{
|
{
|
||||||
if (!w)
|
if (!w)
|
||||||
{
|
{
|
||||||
@ -129,6 +129,19 @@ void repolishStyle(QWidget* w)
|
|||||||
}
|
}
|
||||||
w->style()->unpolish(w);
|
w->style()->unpolish(w);
|
||||||
w->style()->polish(w);
|
w->style()->polish(w);
|
||||||
|
|
||||||
|
if (RepolishIgnoreChildren == Options)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
QList<QWidget*> Children = w->findChildren<QWidget*>(QString(),
|
||||||
|
(RepolishDirectChildren == Options) ? Qt::FindDirectChildrenOnly: Qt::FindChildrenRecursively);
|
||||||
|
for (auto Widget : Children)
|
||||||
|
{
|
||||||
|
Widget->style()->unpolish(Widget);
|
||||||
|
Widget->style()->polish(Widget);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace internal
|
} // namespace internal
|
||||||
|
|||||||
@ -245,11 +245,18 @@ void setButtonIcon(QAbstractButton* Button, QStyle::StandardPixmap StandarPixmap
|
|||||||
ads::eIcon CustomIconId);
|
ads::eIcon CustomIconId);
|
||||||
|
|
||||||
|
|
||||||
|
enum eRepolishChildOptions
|
||||||
|
{
|
||||||
|
RepolishIgnoreChildren,
|
||||||
|
RepolishDirectChildren,
|
||||||
|
RepolishChildrenRecursively
|
||||||
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Calls unpolish() / polish for the style of the given widget to update
|
* Calls unpolish() / polish for the style of the given widget to update
|
||||||
* stylesheet if a property changes
|
* stylesheet if a property changes
|
||||||
*/
|
*/
|
||||||
void repolishStyle(QWidget* w);
|
void repolishStyle(QWidget* w, eRepolishChildOptions Options = RepolishIgnoreChildren);
|
||||||
|
|
||||||
|
|
||||||
} // namespace internal
|
} // namespace internal
|
||||||
|
|||||||
@ -1,6 +1,4 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
|
||||||
|
|
||||||
<svg
|
<svg
|
||||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||||
xmlns:cc="http://creativecommons.org/ns#"
|
xmlns:cc="http://creativecommons.org/ns#"
|
||||||
@ -9,114 +7,133 @@
|
|||||||
xmlns="http://www.w3.org/2000/svg"
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||||
version="1.1"
|
|
||||||
id="Capa_1"
|
|
||||||
x="0px"
|
|
||||||
y="0px"
|
|
||||||
width="512"
|
|
||||||
height="512"
|
|
||||||
viewBox="0 0 512 512"
|
|
||||||
xml:space="preserve"
|
|
||||||
sodipodi:docname="close-button-disabled.svg"
|
sodipodi:docname="close-button-disabled.svg"
|
||||||
inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
|
inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
|
||||||
id="metadata897"><rdf:RDF><cc:Work
|
version="1.1"
|
||||||
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
|
id="svg2"
|
||||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
|
viewBox="0 0 16 16"
|
||||||
id="defs895" /><sodipodi:namedview
|
height="16px"
|
||||||
pagecolor="#ffffff"
|
width="16px">
|
||||||
bordercolor="#666666"
|
<style
|
||||||
borderopacity="1"
|
id="style2"></style>
|
||||||
objecttolerance="10"
|
<defs
|
||||||
gridtolerance="10"
|
id="defs4">
|
||||||
guidetolerance="10"
|
<pattern
|
||||||
inkscape:pageopacity="0"
|
id="EMFhbasepattern"
|
||||||
inkscape:pageshadow="2"
|
patternUnits="userSpaceOnUse"
|
||||||
inkscape:window-width="1920"
|
width="6"
|
||||||
inkscape:window-height="1017"
|
height="6"
|
||||||
id="namedview893"
|
x="0"
|
||||||
showgrid="false"
|
y="0" />
|
||||||
fit-margin-top="0"
|
<pattern
|
||||||
fit-margin-left="0"
|
id="EMFhbasepattern-4"
|
||||||
fit-margin-right="0"
|
patternUnits="userSpaceOnUse"
|
||||||
fit-margin-bottom="0"
|
width="6"
|
||||||
inkscape:zoom="0.85862966"
|
height="6"
|
||||||
inkscape:cx="345.29142"
|
x="0"
|
||||||
inkscape:cy="32.731258"
|
y="0" />
|
||||||
inkscape:window-x="-8"
|
<pattern
|
||||||
inkscape:window-y="-8"
|
id="EMFhbasepattern-3"
|
||||||
|
patternUnits="userSpaceOnUse"
|
||||||
|
width="6"
|
||||||
|
height="6"
|
||||||
|
x="0"
|
||||||
|
y="0" />
|
||||||
|
<pattern
|
||||||
|
id="EMFhbasepattern-8"
|
||||||
|
patternUnits="userSpaceOnUse"
|
||||||
|
width="6"
|
||||||
|
height="6"
|
||||||
|
x="0"
|
||||||
|
y="0" />
|
||||||
|
</defs>
|
||||||
|
<sodipodi:namedview
|
||||||
|
inkscape:guide-bbox="true"
|
||||||
|
showguides="true"
|
||||||
|
inkscape:document-rotation="0"
|
||||||
|
inkscape:snap-global="true"
|
||||||
|
inkscape:snap-bbox-midpoints="true"
|
||||||
|
inkscape:snap-bbox-edge-midpoints="true"
|
||||||
|
inkscape:bbox-nodes="true"
|
||||||
|
inkscape:bbox-paths="true"
|
||||||
|
inkscape:snap-bbox="true"
|
||||||
inkscape:window-maximized="1"
|
inkscape:window-maximized="1"
|
||||||
inkscape:current-layer="Capa_1" />
|
inkscape:window-y="-8"
|
||||||
|
inkscape:window-x="-8"
|
||||||
|
inkscape:window-height="1017"
|
||||||
|
inkscape:window-width="1920"
|
||||||
|
units="px"
|
||||||
|
showgrid="true"
|
||||||
|
inkscape:current-layer="g5228"
|
||||||
|
inkscape:document-units="px"
|
||||||
|
inkscape:cy="13.17691"
|
||||||
|
inkscape:cx="6.2316889"
|
||||||
|
inkscape:zoom="22.627417"
|
||||||
|
inkscape:pageshadow="2"
|
||||||
|
inkscape:pageopacity="0.0"
|
||||||
|
borderopacity="1.0"
|
||||||
|
bordercolor="#666666"
|
||||||
|
pagecolor="#ffffff"
|
||||||
|
id="base">
|
||||||
|
<inkscape:grid
|
||||||
|
id="grid3336"
|
||||||
|
type="xygrid" />
|
||||||
|
<sodipodi:guide
|
||||||
|
id="guide883"
|
||||||
|
orientation="1,0"
|
||||||
|
position="4,10" />
|
||||||
|
<sodipodi:guide
|
||||||
|
id="guide885"
|
||||||
|
orientation="0,-1"
|
||||||
|
position="10,12" />
|
||||||
|
<sodipodi:guide
|
||||||
|
id="guide887"
|
||||||
|
orientation="1,0"
|
||||||
|
position="12,2" />
|
||||||
|
<sodipodi:guide
|
||||||
|
id="guide889"
|
||||||
|
orientation="0,-1"
|
||||||
|
position="14,4" />
|
||||||
|
</sodipodi:namedview>
|
||||||
<g
|
<g
|
||||||
id="g860"
|
transform="translate(0,-1036.3622)"
|
||||||
transform="matrix(0.71708683,0,0,0.71708683,128,128)"
|
id="layer1"
|
||||||
style="stroke:none;stroke-opacity:1;fill:#000000;fill-opacity:0.50196081">
|
inkscape:groupmode="layer"
|
||||||
|
inkscape:label="Layer 1">
|
||||||
<g
|
<g
|
||||||
id="close"
|
id="g5228"
|
||||||
style="stroke:none;stroke-opacity:1;fill:#000000;fill-opacity:0.50196081">
|
transform="translate(628,-140.49998)">
|
||||||
<polygon
|
<path
|
||||||
points="357,321.3 214.2,178.5 357,35.7 321.3,0 178.5,142.8 35.7,0 0,35.7 142.8,178.5 0,321.3 35.7,357 178.5,214.2 321.3,357 "
|
id="path846"
|
||||||
id="polygon857"
|
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.50196081;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1"
|
||||||
style="stroke:none;stroke-opacity:1;fill:#000000;fill-opacity:0.50196081" />
|
d="M 4.4765625 4.0019531 A 0.5 0.5 0 0 0 4.1464844 4.1464844 A 0.5 0.5 0 0 0 4.1464844 4.8535156 L 7.2929688 8 L 4.1464844 11.146484 A 0.5 0.5 0 0 0 4.1464844 11.853516 A 0.5 0.5 0 0 0 4.8535156 11.853516 L 8 8.7070312 L 11.146484 11.853516 A 0.5 0.5 0 0 0 11.853516 11.853516 A 0.5 0.5 0 0 0 11.853516 11.146484 L 8.7070312 8 L 11.853516 4.8535156 A 0.5 0.5 0 0 0 11.853516 4.1464844 A 0.5 0.5 0 0 0 11.476562 4.0019531 A 0.5 0.5 0 0 0 11.146484 4.1464844 L 8 7.2929688 L 4.8535156 4.1464844 A 0.5 0.5 0 0 0 4.4765625 4.0019531 z "
|
||||||
|
transform="translate(-628,1176.8622)" />
|
||||||
</g>
|
</g>
|
||||||
</g>
|
</g>
|
||||||
<g
|
<metadata
|
||||||
id="g862"
|
id="metadata12">
|
||||||
transform="translate(0,155)">
|
<rdf:RDF>
|
||||||
</g>
|
<rdf:Description
|
||||||
<g
|
dc:language="en"
|
||||||
id="g864"
|
dc:format="image/svg+xml"
|
||||||
transform="translate(0,155)">
|
dc:date="2016-12-14"
|
||||||
</g>
|
dc:publisher="Iconscout"
|
||||||
<g
|
dc:description="Menu, Bar, Lines, Option, List, Hamburger, Web"
|
||||||
id="g866"
|
dc:title="Menu, Bar, Lines, Option, List, Hamburger, Web"
|
||||||
transform="translate(0,155)">
|
about="https://iconscout.com/legal#licenses">
|
||||||
</g>
|
<dc:creator>
|
||||||
<g
|
<rdf:Bag>
|
||||||
id="g868"
|
<rdf:li>Jemis Mali</rdf:li>
|
||||||
transform="translate(0,155)">
|
</rdf:Bag>
|
||||||
</g>
|
</dc:creator>
|
||||||
<g
|
</rdf:Description>
|
||||||
id="g870"
|
<cc:Work
|
||||||
transform="translate(0,155)">
|
rdf:about="">
|
||||||
</g>
|
<dc:format>image/svg+xml</dc:format>
|
||||||
<g
|
<dc:type
|
||||||
id="g872"
|
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||||
transform="translate(0,155)">
|
<dc:title></dc:title>
|
||||||
</g>
|
</cc:Work>
|
||||||
<g
|
</rdf:RDF>
|
||||||
id="g874"
|
</metadata>
|
||||||
transform="translate(0,155)">
|
|
||||||
</g>
|
|
||||||
<g
|
|
||||||
id="g876"
|
|
||||||
transform="translate(0,155)">
|
|
||||||
</g>
|
|
||||||
<g
|
|
||||||
id="g878"
|
|
||||||
transform="translate(0,155)">
|
|
||||||
</g>
|
|
||||||
<g
|
|
||||||
id="g880"
|
|
||||||
transform="translate(0,155)">
|
|
||||||
</g>
|
|
||||||
<g
|
|
||||||
id="g882"
|
|
||||||
transform="translate(0,155)">
|
|
||||||
</g>
|
|
||||||
<g
|
|
||||||
id="g884"
|
|
||||||
transform="translate(0,155)">
|
|
||||||
</g>
|
|
||||||
<g
|
|
||||||
id="g886"
|
|
||||||
transform="translate(0,155)">
|
|
||||||
</g>
|
|
||||||
<g
|
|
||||||
id="g888"
|
|
||||||
transform="translate(0,155)">
|
|
||||||
</g>
|
|
||||||
<g
|
|
||||||
id="g890"
|
|
||||||
transform="translate(0,155)">
|
|
||||||
</g>
|
|
||||||
</svg>
|
</svg>
|
||||||
|
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 5.4 KiB |
@ -7,120 +7,120 @@
|
|||||||
xmlns="http://www.w3.org/2000/svg"
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||||
width="16px"
|
sodipodi:docname="close-button-focused.svg"
|
||||||
height="16px"
|
|
||||||
viewBox="0 0 16 16"
|
|
||||||
id="svg2"
|
|
||||||
version="1.1"
|
|
||||||
inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
|
inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
|
||||||
sodipodi:docname="close-button2.svg">
|
version="1.1"
|
||||||
|
id="svg2"
|
||||||
|
viewBox="0 0 16 16"
|
||||||
|
height="16px"
|
||||||
|
width="16px">
|
||||||
<style
|
<style
|
||||||
id="style2"></style>
|
id="style2"></style>
|
||||||
<defs
|
<defs
|
||||||
id="defs4">
|
id="defs4">
|
||||||
<pattern
|
<pattern
|
||||||
y="0"
|
id="EMFhbasepattern"
|
||||||
x="0"
|
|
||||||
height="6"
|
|
||||||
width="6"
|
|
||||||
patternUnits="userSpaceOnUse"
|
patternUnits="userSpaceOnUse"
|
||||||
id="EMFhbasepattern" />
|
width="6"
|
||||||
|
height="6"
|
||||||
|
x="0"
|
||||||
|
y="0" />
|
||||||
<pattern
|
<pattern
|
||||||
y="0"
|
id="EMFhbasepattern-4"
|
||||||
x="0"
|
|
||||||
height="6"
|
|
||||||
width="6"
|
|
||||||
patternUnits="userSpaceOnUse"
|
patternUnits="userSpaceOnUse"
|
||||||
id="EMFhbasepattern-4" />
|
width="6"
|
||||||
|
height="6"
|
||||||
|
x="0"
|
||||||
|
y="0" />
|
||||||
<pattern
|
<pattern
|
||||||
y="0"
|
id="EMFhbasepattern-3"
|
||||||
x="0"
|
|
||||||
height="6"
|
|
||||||
width="6"
|
|
||||||
patternUnits="userSpaceOnUse"
|
patternUnits="userSpaceOnUse"
|
||||||
id="EMFhbasepattern-3" />
|
width="6"
|
||||||
|
height="6"
|
||||||
|
x="0"
|
||||||
|
y="0" />
|
||||||
<pattern
|
<pattern
|
||||||
y="0"
|
id="EMFhbasepattern-8"
|
||||||
x="0"
|
|
||||||
height="6"
|
|
||||||
width="6"
|
|
||||||
patternUnits="userSpaceOnUse"
|
patternUnits="userSpaceOnUse"
|
||||||
id="EMFhbasepattern-8" />
|
width="6"
|
||||||
|
height="6"
|
||||||
|
x="0"
|
||||||
|
y="0" />
|
||||||
</defs>
|
</defs>
|
||||||
<sodipodi:namedview
|
<sodipodi:namedview
|
||||||
id="base"
|
inkscape:guide-bbox="true"
|
||||||
pagecolor="#ffffff"
|
|
||||||
bordercolor="#666666"
|
|
||||||
borderopacity="1.0"
|
|
||||||
inkscape:pageopacity="0.0"
|
|
||||||
inkscape:pageshadow="2"
|
|
||||||
inkscape:zoom="22.627417"
|
|
||||||
inkscape:cx="6.2316889"
|
|
||||||
inkscape:cy="13.17691"
|
|
||||||
inkscape:document-units="px"
|
|
||||||
inkscape:current-layer="g5228"
|
|
||||||
showgrid="true"
|
|
||||||
units="px"
|
|
||||||
inkscape:window-width="1920"
|
|
||||||
inkscape:window-height="1017"
|
|
||||||
inkscape:window-x="-8"
|
|
||||||
inkscape:window-y="-8"
|
|
||||||
inkscape:window-maximized="1"
|
|
||||||
inkscape:snap-bbox="true"
|
|
||||||
inkscape:bbox-paths="true"
|
|
||||||
inkscape:bbox-nodes="true"
|
|
||||||
inkscape:snap-bbox-edge-midpoints="true"
|
|
||||||
inkscape:snap-bbox-midpoints="true"
|
|
||||||
inkscape:snap-global="true"
|
|
||||||
inkscape:document-rotation="0"
|
|
||||||
showguides="true"
|
showguides="true"
|
||||||
inkscape:guide-bbox="true">
|
inkscape:document-rotation="0"
|
||||||
|
inkscape:snap-global="true"
|
||||||
|
inkscape:snap-bbox-midpoints="true"
|
||||||
|
inkscape:snap-bbox-edge-midpoints="true"
|
||||||
|
inkscape:bbox-nodes="true"
|
||||||
|
inkscape:bbox-paths="true"
|
||||||
|
inkscape:snap-bbox="true"
|
||||||
|
inkscape:window-maximized="1"
|
||||||
|
inkscape:window-y="-8"
|
||||||
|
inkscape:window-x="-8"
|
||||||
|
inkscape:window-height="1017"
|
||||||
|
inkscape:window-width="1920"
|
||||||
|
units="px"
|
||||||
|
showgrid="true"
|
||||||
|
inkscape:current-layer="g5228"
|
||||||
|
inkscape:document-units="px"
|
||||||
|
inkscape:cy="13.17691"
|
||||||
|
inkscape:cx="6.2316889"
|
||||||
|
inkscape:zoom="22.627417"
|
||||||
|
inkscape:pageshadow="2"
|
||||||
|
inkscape:pageopacity="0.0"
|
||||||
|
borderopacity="1.0"
|
||||||
|
bordercolor="#666666"
|
||||||
|
pagecolor="#ffffff"
|
||||||
|
id="base">
|
||||||
<inkscape:grid
|
<inkscape:grid
|
||||||
type="xygrid"
|
id="grid3336"
|
||||||
id="grid3336" />
|
type="xygrid" />
|
||||||
<sodipodi:guide
|
<sodipodi:guide
|
||||||
position="4,10"
|
id="guide883"
|
||||||
orientation="1,0"
|
orientation="1,0"
|
||||||
id="guide883" />
|
position="4,10" />
|
||||||
<sodipodi:guide
|
<sodipodi:guide
|
||||||
position="10,12"
|
id="guide885"
|
||||||
orientation="0,-1"
|
orientation="0,-1"
|
||||||
id="guide885" />
|
position="10,12" />
|
||||||
<sodipodi:guide
|
<sodipodi:guide
|
||||||
position="12,2"
|
id="guide887"
|
||||||
orientation="1,0"
|
orientation="1,0"
|
||||||
id="guide887" />
|
position="12,2" />
|
||||||
<sodipodi:guide
|
<sodipodi:guide
|
||||||
position="14,4"
|
id="guide889"
|
||||||
orientation="0,-1"
|
orientation="0,-1"
|
||||||
id="guide889" />
|
position="14,4" />
|
||||||
</sodipodi:namedview>
|
</sodipodi:namedview>
|
||||||
<g
|
<g
|
||||||
inkscape:label="Layer 1"
|
transform="translate(0,-1036.3622)"
|
||||||
inkscape:groupmode="layer"
|
|
||||||
id="layer1"
|
id="layer1"
|
||||||
transform="translate(0,-1036.3622)">
|
inkscape:groupmode="layer"
|
||||||
|
inkscape:label="Layer 1">
|
||||||
<g
|
<g
|
||||||
transform="translate(628,-140.49998)"
|
id="g5228"
|
||||||
id="g5228">
|
transform="translate(628,-140.49998)">
|
||||||
<path
|
<path
|
||||||
transform="translate(-628,1176.8622)"
|
id="path846"
|
||||||
|
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1"
|
||||||
d="M 4.4765625 4.0019531 A 0.5 0.5 0 0 0 4.1464844 4.1464844 A 0.5 0.5 0 0 0 4.1464844 4.8535156 L 7.2929688 8 L 4.1464844 11.146484 A 0.5 0.5 0 0 0 4.1464844 11.853516 A 0.5 0.5 0 0 0 4.8535156 11.853516 L 8 8.7070312 L 11.146484 11.853516 A 0.5 0.5 0 0 0 11.853516 11.853516 A 0.5 0.5 0 0 0 11.853516 11.146484 L 8.7070312 8 L 11.853516 4.8535156 A 0.5 0.5 0 0 0 11.853516 4.1464844 A 0.5 0.5 0 0 0 11.476562 4.0019531 A 0.5 0.5 0 0 0 11.146484 4.1464844 L 8 7.2929688 L 4.8535156 4.1464844 A 0.5 0.5 0 0 0 4.4765625 4.0019531 z "
|
d="M 4.4765625 4.0019531 A 0.5 0.5 0 0 0 4.1464844 4.1464844 A 0.5 0.5 0 0 0 4.1464844 4.8535156 L 7.2929688 8 L 4.1464844 11.146484 A 0.5 0.5 0 0 0 4.1464844 11.853516 A 0.5 0.5 0 0 0 4.8535156 11.853516 L 8 8.7070312 L 11.146484 11.853516 A 0.5 0.5 0 0 0 11.853516 11.853516 A 0.5 0.5 0 0 0 11.853516 11.146484 L 8.7070312 8 L 11.853516 4.8535156 A 0.5 0.5 0 0 0 11.853516 4.1464844 A 0.5 0.5 0 0 0 11.476562 4.0019531 A 0.5 0.5 0 0 0 11.146484 4.1464844 L 8 7.2929688 L 4.8535156 4.1464844 A 0.5 0.5 0 0 0 4.4765625 4.0019531 z "
|
||||||
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1"
|
transform="translate(-628,1176.8622)" />
|
||||||
id="path846" />
|
|
||||||
</g>
|
</g>
|
||||||
</g>
|
</g>
|
||||||
<metadata
|
<metadata
|
||||||
id="metadata12">
|
id="metadata12">
|
||||||
<rdf:RDF>
|
<rdf:RDF>
|
||||||
<rdf:Description
|
<rdf:Description
|
||||||
about="https://iconscout.com/legal#licenses"
|
dc:language="en"
|
||||||
dc:title="Menu, Bar, Lines, Option, List, Hamburger, Web"
|
|
||||||
dc:description="Menu, Bar, Lines, Option, List, Hamburger, Web"
|
|
||||||
dc:publisher="Iconscout"
|
|
||||||
dc:date="2016-12-14"
|
|
||||||
dc:format="image/svg+xml"
|
dc:format="image/svg+xml"
|
||||||
dc:language="en">
|
dc:date="2016-12-14"
|
||||||
|
dc:publisher="Iconscout"
|
||||||
|
dc:description="Menu, Bar, Lines, Option, List, Hamburger, Web"
|
||||||
|
dc:title="Menu, Bar, Lines, Option, List, Hamburger, Web"
|
||||||
|
about="https://iconscout.com/legal#licenses">
|
||||||
<dc:creator>
|
<dc:creator>
|
||||||
<rdf:Bag>
|
<rdf:Bag>
|
||||||
<rdf:li>Jemis Mali</rdf:li>
|
<rdf:li>Jemis Mali</rdf:li>
|
||||||
@ -132,7 +132,7 @@
|
|||||||
<dc:format>image/svg+xml</dc:format>
|
<dc:format>image/svg+xml</dc:format>
|
||||||
<dc:type
|
<dc:type
|
||||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||||
<dc:title />
|
<dc:title></dc:title>
|
||||||
</cc:Work>
|
</cc:Work>
|
||||||
</rdf:RDF>
|
</rdf:RDF>
|
||||||
</metadata>
|
</metadata>
|
||||||
|
Before Width: | Height: | Size: 5.4 KiB After Width: | Height: | Size: 5.4 KiB |
@ -1,6 +1,4 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
|
||||||
|
|
||||||
<svg
|
<svg
|
||||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||||
xmlns:cc="http://creativecommons.org/ns#"
|
xmlns:cc="http://creativecommons.org/ns#"
|
||||||
@ -9,111 +7,133 @@
|
|||||||
xmlns="http://www.w3.org/2000/svg"
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||||
|
width="16px"
|
||||||
|
height="16px"
|
||||||
|
viewBox="0 0 16 16"
|
||||||
|
id="svg2"
|
||||||
version="1.1"
|
version="1.1"
|
||||||
id="Capa_1"
|
inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
|
||||||
x="0px"
|
sodipodi:docname="close-button2.svg">
|
||||||
y="0px"
|
<style
|
||||||
width="512"
|
id="style2"></style>
|
||||||
height="512"
|
<defs
|
||||||
viewBox="0 0 512 512"
|
id="defs4">
|
||||||
xml:space="preserve"
|
<pattern
|
||||||
sodipodi:docname="close-button.svg"
|
y="0"
|
||||||
inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
|
x="0"
|
||||||
id="metadata897"><rdf:RDF><cc:Work
|
height="6"
|
||||||
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
|
width="6"
|
||||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
|
patternUnits="userSpaceOnUse"
|
||||||
id="defs895" /><sodipodi:namedview
|
id="EMFhbasepattern" />
|
||||||
|
<pattern
|
||||||
|
y="0"
|
||||||
|
x="0"
|
||||||
|
height="6"
|
||||||
|
width="6"
|
||||||
|
patternUnits="userSpaceOnUse"
|
||||||
|
id="EMFhbasepattern-4" />
|
||||||
|
<pattern
|
||||||
|
y="0"
|
||||||
|
x="0"
|
||||||
|
height="6"
|
||||||
|
width="6"
|
||||||
|
patternUnits="userSpaceOnUse"
|
||||||
|
id="EMFhbasepattern-3" />
|
||||||
|
<pattern
|
||||||
|
y="0"
|
||||||
|
x="0"
|
||||||
|
height="6"
|
||||||
|
width="6"
|
||||||
|
patternUnits="userSpaceOnUse"
|
||||||
|
id="EMFhbasepattern-8" />
|
||||||
|
</defs>
|
||||||
|
<sodipodi:namedview
|
||||||
|
id="base"
|
||||||
pagecolor="#ffffff"
|
pagecolor="#ffffff"
|
||||||
bordercolor="#666666"
|
bordercolor="#666666"
|
||||||
borderopacity="1"
|
borderopacity="1.0"
|
||||||
objecttolerance="10"
|
inkscape:pageopacity="0.0"
|
||||||
gridtolerance="10"
|
|
||||||
guidetolerance="10"
|
|
||||||
inkscape:pageopacity="0"
|
|
||||||
inkscape:pageshadow="2"
|
inkscape:pageshadow="2"
|
||||||
|
inkscape:zoom="22.627417"
|
||||||
|
inkscape:cx="6.2316889"
|
||||||
|
inkscape:cy="13.17691"
|
||||||
|
inkscape:document-units="px"
|
||||||
|
inkscape:current-layer="g5228"
|
||||||
|
showgrid="true"
|
||||||
|
units="px"
|
||||||
inkscape:window-width="1920"
|
inkscape:window-width="1920"
|
||||||
inkscape:window-height="1017"
|
inkscape:window-height="1017"
|
||||||
id="namedview893"
|
|
||||||
showgrid="false"
|
|
||||||
fit-margin-top="0"
|
|
||||||
fit-margin-left="0"
|
|
||||||
fit-margin-right="0"
|
|
||||||
fit-margin-bottom="0"
|
|
||||||
inkscape:zoom="0.85862966"
|
|
||||||
inkscape:cx="345.29142"
|
|
||||||
inkscape:cy="32.731258"
|
|
||||||
inkscape:window-x="-8"
|
inkscape:window-x="-8"
|
||||||
inkscape:window-y="-8"
|
inkscape:window-y="-8"
|
||||||
inkscape:window-maximized="1"
|
inkscape:window-maximized="1"
|
||||||
inkscape:current-layer="Capa_1" />
|
inkscape:snap-bbox="true"
|
||||||
|
inkscape:bbox-paths="true"
|
||||||
|
inkscape:bbox-nodes="true"
|
||||||
|
inkscape:snap-bbox-edge-midpoints="true"
|
||||||
|
inkscape:snap-bbox-midpoints="true"
|
||||||
|
inkscape:snap-global="true"
|
||||||
|
inkscape:document-rotation="0"
|
||||||
|
showguides="true"
|
||||||
|
inkscape:guide-bbox="true">
|
||||||
|
<inkscape:grid
|
||||||
|
type="xygrid"
|
||||||
|
id="grid3336" />
|
||||||
|
<sodipodi:guide
|
||||||
|
position="4,10"
|
||||||
|
orientation="1,0"
|
||||||
|
id="guide883" />
|
||||||
|
<sodipodi:guide
|
||||||
|
position="10,12"
|
||||||
|
orientation="0,-1"
|
||||||
|
id="guide885" />
|
||||||
|
<sodipodi:guide
|
||||||
|
position="12,2"
|
||||||
|
orientation="1,0"
|
||||||
|
id="guide887" />
|
||||||
|
<sodipodi:guide
|
||||||
|
position="14,4"
|
||||||
|
orientation="0,-1"
|
||||||
|
id="guide889" />
|
||||||
|
</sodipodi:namedview>
|
||||||
<g
|
<g
|
||||||
id="g860"
|
inkscape:label="Layer 1"
|
||||||
transform="matrix(0.71708683,0,0,0.71708683,128,128)">
|
inkscape:groupmode="layer"
|
||||||
|
id="layer1"
|
||||||
|
transform="translate(0,-1036.3622)">
|
||||||
<g
|
<g
|
||||||
id="close">
|
transform="translate(628,-140.49998)"
|
||||||
<polygon
|
id="g5228">
|
||||||
points="357,321.3 214.2,178.5 357,35.7 321.3,0 178.5,142.8 35.7,0 0,35.7 142.8,178.5 0,321.3 35.7,357 178.5,214.2 321.3,357 "
|
<path
|
||||||
id="polygon857" />
|
transform="translate(-628,1176.8622)"
|
||||||
|
d="M 4.4765625 4.0019531 A 0.5 0.5 0 0 0 4.1464844 4.1464844 A 0.5 0.5 0 0 0 4.1464844 4.8535156 L 7.2929688 8 L 4.1464844 11.146484 A 0.5 0.5 0 0 0 4.1464844 11.853516 A 0.5 0.5 0 0 0 4.8535156 11.853516 L 8 8.7070312 L 11.146484 11.853516 A 0.5 0.5 0 0 0 11.853516 11.853516 A 0.5 0.5 0 0 0 11.853516 11.146484 L 8.7070312 8 L 11.853516 4.8535156 A 0.5 0.5 0 0 0 11.853516 4.1464844 A 0.5 0.5 0 0 0 11.476562 4.0019531 A 0.5 0.5 0 0 0 11.146484 4.1464844 L 8 7.2929688 L 4.8535156 4.1464844 A 0.5 0.5 0 0 0 4.4765625 4.0019531 z "
|
||||||
|
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1"
|
||||||
|
id="path846" />
|
||||||
</g>
|
</g>
|
||||||
</g>
|
</g>
|
||||||
<g
|
<metadata
|
||||||
id="g862"
|
id="metadata12">
|
||||||
transform="translate(0,155)">
|
<rdf:RDF>
|
||||||
</g>
|
<rdf:Description
|
||||||
<g
|
about="https://iconscout.com/legal#licenses"
|
||||||
id="g864"
|
dc:title="Menu, Bar, Lines, Option, List, Hamburger, Web"
|
||||||
transform="translate(0,155)">
|
dc:description="Menu, Bar, Lines, Option, List, Hamburger, Web"
|
||||||
</g>
|
dc:publisher="Iconscout"
|
||||||
<g
|
dc:date="2016-12-14"
|
||||||
id="g866"
|
dc:format="image/svg+xml"
|
||||||
transform="translate(0,155)">
|
dc:language="en">
|
||||||
</g>
|
<dc:creator>
|
||||||
<g
|
<rdf:Bag>
|
||||||
id="g868"
|
<rdf:li>Jemis Mali</rdf:li>
|
||||||
transform="translate(0,155)">
|
</rdf:Bag>
|
||||||
</g>
|
</dc:creator>
|
||||||
<g
|
</rdf:Description>
|
||||||
id="g870"
|
<cc:Work
|
||||||
transform="translate(0,155)">
|
rdf:about="">
|
||||||
</g>
|
<dc:format>image/svg+xml</dc:format>
|
||||||
<g
|
<dc:type
|
||||||
id="g872"
|
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||||
transform="translate(0,155)">
|
<dc:title />
|
||||||
</g>
|
</cc:Work>
|
||||||
<g
|
</rdf:RDF>
|
||||||
id="g874"
|
</metadata>
|
||||||
transform="translate(0,155)">
|
|
||||||
</g>
|
|
||||||
<g
|
|
||||||
id="g876"
|
|
||||||
transform="translate(0,155)">
|
|
||||||
</g>
|
|
||||||
<g
|
|
||||||
id="g878"
|
|
||||||
transform="translate(0,155)">
|
|
||||||
</g>
|
|
||||||
<g
|
|
||||||
id="g880"
|
|
||||||
transform="translate(0,155)">
|
|
||||||
</g>
|
|
||||||
<g
|
|
||||||
id="g882"
|
|
||||||
transform="translate(0,155)">
|
|
||||||
</g>
|
|
||||||
<g
|
|
||||||
id="g884"
|
|
||||||
transform="translate(0,155)">
|
|
||||||
</g>
|
|
||||||
<g
|
|
||||||
id="g886"
|
|
||||||
transform="translate(0,155)">
|
|
||||||
</g>
|
|
||||||
<g
|
|
||||||
id="g888"
|
|
||||||
transform="translate(0,155)">
|
|
||||||
</g>
|
|
||||||
<g
|
|
||||||
id="g890"
|
|
||||||
transform="translate(0,155)">
|
|
||||||
</g>
|
|
||||||
</svg>
|
</svg>
|
||||||
|
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 5.4 KiB |
@ -89,7 +89,7 @@ QScrollArea#dockWidgetScrollArea
|
|||||||
|
|
||||||
#tabCloseButton
|
#tabCloseButton
|
||||||
{
|
{
|
||||||
qproperty-icon: url(:/ads/images/close-button2.svg);
|
qproperty-icon: url(:/ads/images/close-button.svg);
|
||||||
qproperty-iconSize: 16px;
|
qproperty-iconSize: 16px;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -105,15 +105,27 @@ ads--CDockSplitter::handle
|
|||||||
|
|
||||||
/* Focus related styling */
|
/* Focus related styling */
|
||||||
ads--CDockWidgetTab[focused="true"]
|
ads--CDockWidgetTab[focused="true"]
|
||||||
{
|
{;
|
||||||
background: palette(highlight);
|
background: palette(highlight);
|
||||||
border-color: palette(highlight);
|
border-color: palette(highlight);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ads--CDockWidgetTab[focused="true"] > #tabCloseButton
|
||||||
|
{
|
||||||
|
qproperty-icon: url(:/ads/images/close-button-focused.svg)
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
ads--CDockWidgetTab[focused="true"] > #tabCloseButton:hover
|
ads--CDockWidgetTab[focused="true"] > #tabCloseButton:hover
|
||||||
{
|
{
|
||||||
background: rgba(255, 255, 255, 24);
|
background: rgba(255, 255, 255, 48);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
ads--CDockWidgetTab[focused="true"] > #tabCloseButton:pressed
|
||||||
|
{
|
||||||
|
background: rgba(255, 255, 255, 92);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user