mirror of
https://gitlab.gnome.org/GNOME/gimp.git
synced 2025-07-03 17:33:25 +00:00
Issue #5875: Close button too big on wayland backend.
The issue is that on X11, the window manager draws the title bar hence uses the window-close button from the system theme, though on Wayland, GTK draws its own decorations. Since we provide a window-close, we end up with a disparity between this button and the minimize/maximize buttons. For now, let's just get rid of the window-close icon as an easy solution, thus GIMP will always use the window-close icon from system theme. Maybe we can restore our own window-close icon later, but we should make sure to at least have also window-maximize and window-minimize icons so that the 3 buttons next to each others won't look too mismatched. And probably we should also have smaller-size design because it doesn't look so nice when huge (though it might simply have been the size mismatch which gave this feeling).
This commit is contained in:
Jehan
parent
62b332ee24
commit
68851c1aaa
6 changed files with 0 additions and 222 deletions
Binary file not shown.
|
Before Width: | Height: | Size: 393 B |
|
|
@ -55,7 +55,6 @@ scalable_images = \
|
||||||
scalable/system-run.svg \
|
scalable/system-run.svg \
|
||||||
scalable/view-fullscreen.svg \
|
scalable/view-fullscreen.svg \
|
||||||
scalable/view-refresh.svg \
|
scalable/view-refresh.svg \
|
||||||
scalable/window-close.svg \
|
|
||||||
scalable/window-new.svg \
|
scalable/window-new.svg \
|
||||||
scalable/zoom-fit-best.svg \
|
scalable/zoom-fit-best.svg \
|
||||||
scalable/zoom-in.svg \
|
scalable/zoom-in.svg \
|
||||||
|
|
@ -593,7 +592,6 @@ icons16_images = \
|
||||||
16/system-run.png \
|
16/system-run.png \
|
||||||
16/view-fullscreen.png \
|
16/view-fullscreen.png \
|
||||||
16/view-refresh.png \
|
16/view-refresh.png \
|
||||||
16/window-close.png \
|
|
||||||
16/window-new.png \
|
16/window-new.png \
|
||||||
16/zoom-fit-best.png \
|
16/zoom-fit-best.png \
|
||||||
16/zoom-in.png \
|
16/zoom-in.png \
|
||||||
|
|
|
||||||
|
|
@ -1,108 +0,0 @@
|
||||||
<?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="16"
|
|
||||||
height="16"
|
|
||||||
viewBox="0 0 16 16"
|
|
||||||
id="svg30571"
|
|
||||||
version="1.1"
|
|
||||||
inkscape:version="0.92pre1 unknown"
|
|
||||||
sodipodi:docname="gimp-quit.svg">
|
|
||||||
<defs
|
|
||||||
id="defs30573" />
|
|
||||||
<sodipodi:namedview
|
|
||||||
id="base"
|
|
||||||
pagecolor="#76ffff"
|
|
||||||
bordercolor="#666666"
|
|
||||||
borderopacity="1"
|
|
||||||
inkscape:pageopacity="0"
|
|
||||||
inkscape:pageshadow="2"
|
|
||||||
inkscape:zoom="22.627417"
|
|
||||||
inkscape:cx="-3.1642318"
|
|
||||||
inkscape:cy="5.0676358"
|
|
||||||
inkscape:document-units="px"
|
|
||||||
inkscape:current-layer="layer1"
|
|
||||||
showgrid="true"
|
|
||||||
units="px"
|
|
||||||
inkscape:snap-page="true"
|
|
||||||
inkscape:snap-bbox="true"
|
|
||||||
inkscape:bbox-paths="true"
|
|
||||||
inkscape:bbox-nodes="true"
|
|
||||||
inkscape:snap-bbox-edge-midpoints="true"
|
|
||||||
inkscape:snap-bbox-midpoints="true"
|
|
||||||
inkscape:object-paths="true"
|
|
||||||
inkscape:snap-intersection-paths="true"
|
|
||||||
inkscape:object-nodes="true"
|
|
||||||
inkscape:snap-smooth-nodes="true"
|
|
||||||
inkscape:snap-midpoints="true"
|
|
||||||
inkscape:snap-object-midpoints="true"
|
|
||||||
inkscape:snap-center="true"
|
|
||||||
inkscape:snap-text-baseline="true"
|
|
||||||
showborder="false"
|
|
||||||
inkscape:window-width="1920"
|
|
||||||
inkscape:window-height="1016"
|
|
||||||
inkscape:window-x="0"
|
|
||||||
inkscape:window-y="27"
|
|
||||||
inkscape:window-maximized="1"
|
|
||||||
inkscape:snap-global="false"
|
|
||||||
showguides="false">
|
|
||||||
<inkscape:grid
|
|
||||||
type="xygrid"
|
|
||||||
id="grid4237" />
|
|
||||||
</sodipodi:namedview>
|
|
||||||
<metadata
|
|
||||||
id="metadata30576">
|
|
||||||
<rdf:RDF>
|
|
||||||
<cc:Work
|
|
||||||
rdf:about="">
|
|
||||||
<dc:format>
|
|
||||||
image/svg+xml
|
|
||||||
</dc:format>
|
|
||||||
<dc:type
|
|
||||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
|
||||||
<dc:creator>
|
|
||||||
<cc:Agent>
|
|
||||||
<dc:title>Klaus Staedtler </dc:title>
|
|
||||||
</cc:Agent>
|
|
||||||
</dc:creator>
|
|
||||||
<dc:title></dc:title>
|
|
||||||
</cc:Work>
|
|
||||||
</rdf:RDF>
|
|
||||||
</metadata>
|
|
||||||
<g
|
|
||||||
inkscape:label="Layer 1"
|
|
||||||
inkscape:groupmode="layer"
|
|
||||||
id="layer1"
|
|
||||||
transform="translate(0,-1036.3622)">
|
|
||||||
<g
|
|
||||||
id="g4246">
|
|
||||||
<g
|
|
||||||
id="g4239">
|
|
||||||
<g
|
|
||||||
id="g7082"
|
|
||||||
transform="matrix(1.70995,-0.0450243,0.04544797,1.7064456,17.314404,-697.44834)">
|
|
||||||
<path
|
|
||||||
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;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;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.26079771;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"
|
|
||||||
d="M 2.5859375 1 C 1.1413751 1.039061 0.45432169 2.8449876 1.5136719 3.8476562 L 5.7285156 7.9335938 L 5.828125 8.03125 L 5.796875 8.0625 L 1.5 12.246094 C -0.01372932 13.802694 2.2480915 16.027203 3.7617188 14.470703 L 8.1582031 10.300781 L 12.246094 14.5 C 13.802641 16.013652 16.027252 13.751934 14.470703 12.238281 L 10.425781 7.9726562 L 10.457031 7.9414062 L 14.529297 3.7539062 C 14.840272 3.4431063 15.010617 3.0212375 15 2.5859375 C 14.9612 1.1413375 13.154997 0.45427187 12.152344 1.5136719 L 8.0976562 5.6972656 L 7.9394531 5.5429688 L 3.7539062 1.4707031 C 3.4431841 1.1595556 3.0212069 0.98956361 2.5859375 1 z "
|
|
||||||
transform="matrix(0.5844026,0.01541937,-0.01556446,0.58560274,-37.104415,1015.0572)"
|
|
||||||
id="path6388-7-7-4-7" />
|
|
||||||
<g
|
|
||||||
id="g7078" />
|
|
||||||
</g>
|
|
||||||
<rect
|
|
||||||
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.4848485;stroke-linecap:round;stroke-linejoin:round;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"
|
|
||||||
id="rect3999"
|
|
||||||
width="16"
|
|
||||||
height="16"
|
|
||||||
x="0"
|
|
||||||
y="1036.3622" />
|
|
||||||
</g>
|
|
||||||
</g>
|
|
||||||
</g>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 5 KiB |
|
|
@ -55,7 +55,6 @@ scalable_images = \
|
||||||
scalable/system-run-symbolic.svg \
|
scalable/system-run-symbolic.svg \
|
||||||
scalable/view-fullscreen-symbolic.svg \
|
scalable/view-fullscreen-symbolic.svg \
|
||||||
scalable/view-refresh-symbolic.svg \
|
scalable/view-refresh-symbolic.svg \
|
||||||
scalable/window-close-symbolic.svg \
|
|
||||||
scalable/window-new-symbolic.svg \
|
scalable/window-new-symbolic.svg \
|
||||||
scalable/zoom-fit-best-symbolic.svg \
|
scalable/zoom-fit-best-symbolic.svg \
|
||||||
scalable/zoom-in-symbolic.svg \
|
scalable/zoom-in-symbolic.svg \
|
||||||
|
|
@ -593,7 +592,6 @@ icons16_images = \
|
||||||
16/system-run-symbolic.symbolic.png \
|
16/system-run-symbolic.symbolic.png \
|
||||||
16/view-fullscreen-symbolic.symbolic.png \
|
16/view-fullscreen-symbolic.symbolic.png \
|
||||||
16/view-refresh-symbolic.symbolic.png \
|
16/view-refresh-symbolic.symbolic.png \
|
||||||
16/window-close-symbolic.symbolic.png \
|
|
||||||
16/window-new-symbolic.symbolic.png \
|
16/window-new-symbolic.symbolic.png \
|
||||||
16/zoom-fit-best-symbolic.symbolic.png \
|
16/zoom-fit-best-symbolic.symbolic.png \
|
||||||
16/zoom-in-symbolic.symbolic.png \
|
16/zoom-in-symbolic.symbolic.png \
|
||||||
|
|
|
||||||
|
|
@ -1,107 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
|
||||||
<svg
|
|
||||||
xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
|
|
||||||
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="16"
|
|
||||||
height="16"
|
|
||||||
viewBox="0 0 16 16"
|
|
||||||
id="svg30571"
|
|
||||||
version="1.1"
|
|
||||||
inkscape:version="0.92pre1 unknown"
|
|
||||||
sodipodi:docname="gimp-quit.svg">
|
|
||||||
<defs
|
|
||||||
id="defs30573">
|
|
||||||
<linearGradient
|
|
||||||
id="linearGradient19282"
|
|
||||||
osb:paint="solid"
|
|
||||||
gradientTransform="matrix(1.2178615,0,0,1.043881,378.84797,1794.4958)">
|
|
||||||
<stop
|
|
||||||
offset="0"
|
|
||||||
id="stop19284"
|
|
||||||
style="stop-color:#505050;stop-opacity:1;" />
|
|
||||||
</linearGradient>
|
|
||||||
</defs>
|
|
||||||
<sodipodi:namedview
|
|
||||||
id="base"
|
|
||||||
pagecolor="#ffffff"
|
|
||||||
bordercolor="#666666"
|
|
||||||
borderopacity="1"
|
|
||||||
inkscape:pageopacity="0"
|
|
||||||
inkscape:pageshadow="2"
|
|
||||||
inkscape:zoom="28.000354"
|
|
||||||
inkscape:cx="13.432765"
|
|
||||||
inkscape:cy="13.00024"
|
|
||||||
inkscape:document-units="px"
|
|
||||||
inkscape:current-layer="layer1"
|
|
||||||
showgrid="true"
|
|
||||||
units="px"
|
|
||||||
inkscape:snap-page="true"
|
|
||||||
inkscape:snap-bbox="true"
|
|
||||||
inkscape:bbox-paths="true"
|
|
||||||
inkscape:bbox-nodes="true"
|
|
||||||
inkscape:snap-bbox-edge-midpoints="true"
|
|
||||||
inkscape:snap-bbox-midpoints="true"
|
|
||||||
inkscape:object-paths="true"
|
|
||||||
inkscape:snap-intersection-paths="true"
|
|
||||||
inkscape:object-nodes="true"
|
|
||||||
inkscape:snap-smooth-nodes="true"
|
|
||||||
inkscape:snap-midpoints="true"
|
|
||||||
inkscape:snap-object-midpoints="true"
|
|
||||||
inkscape:snap-center="true"
|
|
||||||
inkscape:snap-text-baseline="true"
|
|
||||||
showborder="false"
|
|
||||||
inkscape:window-width="1920"
|
|
||||||
inkscape:window-height="1016"
|
|
||||||
inkscape:window-x="0"
|
|
||||||
inkscape:window-y="27"
|
|
||||||
inkscape:window-maximized="1">
|
|
||||||
<inkscape:grid
|
|
||||||
type="xygrid"
|
|
||||||
id="grid4241" />
|
|
||||||
</sodipodi:namedview>
|
|
||||||
<metadata
|
|
||||||
id="metadata30576">
|
|
||||||
<rdf:RDF>
|
|
||||||
<cc:Work
|
|
||||||
rdf:about="">
|
|
||||||
<dc:format>
|
|
||||||
image/svg+xml
|
|
||||||
</dc:format>
|
|
||||||
<dc:type
|
|
||||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
|
||||||
<dc:creator>
|
|
||||||
<cc:Agent>
|
|
||||||
<dc:title>Klaus Staedtler </dc:title>
|
|
||||||
</cc:Agent>
|
|
||||||
</dc:creator>
|
|
||||||
<dc:title></dc:title>
|
|
||||||
</cc:Work>
|
|
||||||
</rdf:RDF>
|
|
||||||
</metadata>
|
|
||||||
<g
|
|
||||||
inkscape:label="Layer 1"
|
|
||||||
inkscape:groupmode="layer"
|
|
||||||
id="layer1"
|
|
||||||
transform="translate(0,-1036.3622)">
|
|
||||||
<g
|
|
||||||
id="g7082"
|
|
||||||
transform="matrix(-0.95044264,0.95567911,-0.95567911,-0.95044264,951.74982,2043.6895)">
|
|
||||||
<g
|
|
||||||
id="g4248">
|
|
||||||
<path
|
|
||||||
inkscape:connector-curvature="0"
|
|
||||||
id="path6388-7-7-4-7"
|
|
||||||
d="m -38.702291,1019.4401 a 1.2088921,1.2031036 45.157416 0 0 1.22702,1.1539 l 4.328611,-0.062 0.05582,4.3273 a 1.2097974,1.2040046 45.157416 0 0 2.413556,-0.02 l -0.05786,-4.3407 4.341827,-0.062 a 1.2086076,1.2028205 45.157416 0 0 0.804339,-2.0962 1.2086076,1.2028205 45.157416 0 0 -0.851595,-0.3155 l -4.326734,0.062 -0.05773,-4.3292 a 1.2086076,1.2028205 45.157416 0 0 -0.36448,-0.8671 1.2086076,1.2028205 45.157416 0 0 -2.045307,0.8877 l 0.05601,4.3426 -4.339922,0.062 a 1.2088921,1.2031036 45.157416 0 0 -1.183546,1.2577 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-feature-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;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.4111805;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" />
|
|
||||||
<g
|
|
||||||
id="g7078" />
|
|
||||||
</g>
|
|
||||||
</g>
|
|
||||||
</g>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 4.7 KiB |
|
|
@ -56,7 +56,6 @@ color_vector_scalable = [
|
||||||
'scalable/system-run.svg',
|
'scalable/system-run.svg',
|
||||||
'scalable/view-fullscreen.svg',
|
'scalable/view-fullscreen.svg',
|
||||||
'scalable/view-refresh.svg',
|
'scalable/view-refresh.svg',
|
||||||
'scalable/window-close.svg',
|
|
||||||
'scalable/window-new.svg',
|
'scalable/window-new.svg',
|
||||||
'scalable/zoom-fit-best.svg',
|
'scalable/zoom-fit-best.svg',
|
||||||
'scalable/zoom-in.svg',
|
'scalable/zoom-in.svg',
|
||||||
|
|
@ -578,7 +577,6 @@ symbolic_vector_scalable = [
|
||||||
'scalable/system-run-symbolic.svg',
|
'scalable/system-run-symbolic.svg',
|
||||||
'scalable/view-fullscreen-symbolic.svg',
|
'scalable/view-fullscreen-symbolic.svg',
|
||||||
'scalable/view-refresh-symbolic.svg',
|
'scalable/view-refresh-symbolic.svg',
|
||||||
'scalable/window-close-symbolic.svg',
|
|
||||||
'scalable/window-new-symbolic.svg',
|
'scalable/window-new-symbolic.svg',
|
||||||
'scalable/zoom-fit-best-symbolic.svg',
|
'scalable/zoom-fit-best-symbolic.svg',
|
||||||
'scalable/zoom-in-symbolic.svg',
|
'scalable/zoom-in-symbolic.svg',
|
||||||
|
|
@ -1324,7 +1322,6 @@ bitmap_16 = [
|
||||||
'16/system-run.png',
|
'16/system-run.png',
|
||||||
'16/view-fullscreen.png',
|
'16/view-fullscreen.png',
|
||||||
'16/view-refresh.png',
|
'16/view-refresh.png',
|
||||||
'16/window-close.png',
|
|
||||||
'16/window-new.png',
|
'16/window-new.png',
|
||||||
'16/zoom-fit-best.png',
|
'16/zoom-fit-best.png',
|
||||||
'16/zoom-in.png',
|
'16/zoom-in.png',
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue