Added new close button SVG icon

githubuser0xFFFF · githubuser0xFFFF · commit 227037e42ab5 · 2020-06-07T15:20:24.000+02:00
diff --git a/src/ads.qrc b/src/ads.qrc
@@ -4,5 +4,6 @@
         <file>images/close-button.svg</file>
         <file>images/close-button-disabled.svg</file>
         <file>stylesheets/default_linux.css</file>
+        <file>images/close-button2.svg</file>
     </qresource>
 </RCC>
diff --git a/src/images/close-button2.svg b/src/images/close-button2.svg
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   width="16px"
+   height="16px"
+   viewBox="0 0 16 16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:docname="close-button2.svg">
+  <style
+     id="style2"></style>
+  <defs
+     id="defs4">
+    <pattern
+       y="0"
+       x="0"
+       height="6"
+       width="6"
+       patternUnits="userSpaceOnUse"
+       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"
+     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"
+     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
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <g
+       transform="translate(628,-140.49998)"
+       id="g5228">
+      <path
+         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>
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <rdf:Description
+         about="https://iconscout.com/legal#licenses"
+         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:language="en">
+        <dc:creator>
+          <rdf:Bag>
+            <rdf:li>Jemis Mali</rdf:li>
+          </rdf:Bag>
+        </dc:creator>
+      </rdf:Description>
+      <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>
+</svg>
diff --git a/src/stylesheets/default.css b/src/stylesheets/default.css
@@ -78,13 +78,19 @@ QScrollArea#dockWidgetScrollArea
 
 #tabCloseButton:hover
 {
-	border: 1px solid rgba(0, 0, 0, 32);
-	background: rgba(0, 0, 0, 16);
+	/*border: 1px solid rgba(0, 0, 0, 32);*/
+	background: rgba(0, 0, 0, 24);
 }
 
 #tabCloseButton:pressed
 {
-	background: rgba(0, 0, 0, 32);
+	background: rgba(0, 0, 0, 48);
+}
+
+#tabCloseButton
+{
+	qproperty-icon: url(:/ads/images/close-button2.svg);
+	qproperty-iconSize: 16px;
 }
 
 
@@ -104,6 +110,13 @@ ads--CDockWidgetTab[focused="true"]
     border-color: palette(highlight);
 }
 
+
+ads--CDockWidgetTab[focused="true"] > #tabCloseButton:hover
+{
+	background: rgba(255, 255, 255, 24);
+}
+
+
 ads--CDockWidgetTab[focused="true"] QLabel
 {
     color: palette(light);
@@ -123,3 +136,4 @@ ads--CDockAreaWidget[focused="true"] ads--CDockAreaTitleBar
 	border-bottom: 2px solid palette(highlight);
 	padding-bottom: 0px;
 }
+

Original file line number	Diff line number	Diff line change
`@@ -78,13 +78,19 @@ QScrollArea#dockWidgetScrollArea`
`78`	`78`
`79`	`79`	`#tabCloseButton:hover`
`80`	`80`	`{`
`81`		`- border: 1px solid rgba(0, 0, 0, 32);`
`82`		`- background: rgba(0, 0, 0, 16);`
	`81`	`+ /border: 1px solid rgba(0, 0, 0, 32);/`
	`82`	`+ background: rgba(0, 0, 0, 24);`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`#tabCloseButton:pressed`
`86`	`86`	`{`
`87`		`- background: rgba(0, 0, 0, 32);`
	`87`	`+ background: rgba(0, 0, 0, 48);`
	`88`	`+}`
	`89`	`+`
	`90`	`+#tabCloseButton`
	`91`	`+{`
	`92`	`+ qproperty-icon: url(:/ads/images/close-button2.svg);`
	`93`	`+ qproperty-iconSize: 16px;`
`88`	`94`	`}`
`89`	`95`
`90`	`96`
`@@ -104,6 +110,13 @@ ads--CDockWidgetTab[focused="true"]`
`104`	`110`	`border-color: palette(highlight);`
`105`	`111`	`}`
`106`	`112`
	`113`	`+`
	`114`	`+ads--CDockWidgetTab[focused="true"] > #tabCloseButton:hover`
	`115`	`+{`
	`116`	`+ background: rgba(255, 255, 255, 24);`
	`117`	`+}`
	`118`	`+`
	`119`	`+`
`107`	`120`	`ads--CDockWidgetTab[focused="true"] QLabel`
`108`	`121`	`{`
`109`	`122`	`color: palette(light);`
`@@ -123,3 +136,4 @@ ads--CDockAreaWidget[focused="true"] ads--CDockAreaTitleBar`
`123`	`136`	`border-bottom: 2px solid palette(highlight);`
`124`	`137`	`padding-bottom: 0px;`
`125`	`138`	`}`
	`139`	`+`