Remove rounded borders to plasmoidHeading

Summary: Neither the merged look nor the normal one needs to have rounded borders, as they are clipped out from the dialog and they would break third party themes without rounding. Without rounded borders, there's no need for the enabledBorders check, which also broke the heading when used in top panels.

Reviewers: #plasma, ngraham

Reviewed By: ngraham

Subscribers: manueljlin, ahiemstra, ndavis, ngraham, mart, davidedmundson, kde-frameworks-devel

Tags: #frameworks

Differential Revision: https://phabricator.kde.org/D28372
This commit is contained in:
Niccolò Venerandi 2020-04-11 23:49:10 +02:00
parent 9a4ec598ec
commit 0f9abc2d40
2 changed files with 29 additions and 41 deletions

View File

@ -67,17 +67,5 @@ import QtQuick.Templates 2.12 as T
id: headingSvg
imagePath: "widgets/plasmoidheading"
prefix: location == PlasmoidHeading.Location.Header? 'header' : 'footer'
enabledBorders: {
var borders = new Array()
borders |= PlasmaCore.FrameSvg.LeftBorder
borders |= PlasmaCore.FrameSvg.RightBorder
if (plasmoid.location !== PlasmaCore.Types.TopEdge || location != PlasmoidHeading.Location.Header) {
borders |= PlasmaCore.FrameSvg.TopBorder
}
if (plasmoid.location !== PlasmaCore.Types.BottomEdge || location != PlasmoidHeading.Location.Footer) {
borders |= PlasmaCore.FrameSvg.BottomBorder
}
return borders
}
}
}

View File

@ -5,45 +5,45 @@
.ColorScheme-Background {
color:#eff0f1;
}</style>
<path id="hint-stretch-borders" d="m-7-6.999998h5v5h-5z" opacity=".6"/>
<path id="header-center" class="ColorScheme-Background" d="m19 11.999983h32v32h-32z" fill="currentColor" opacity=".75"/>
<path id="header-right" class="ColorScheme-Background" d="m50.999981 11.999983h6v32h-6z" fill="currentColor" opacity=".75"/>
<path id="header-top" class="ColorScheme-Background" transform="rotate(-90)" d="m-11.999946 18.999992h6v32h-6z" fill="currentColor" opacity=".75"/>
<path id="hint-stretch-borders" d="m-7-7h5v5h-5z" opacity=".6"/>
<path id="header-center" class="ColorScheme-Background" d="m19 12h32v32h-32z" fill="currentColor" opacity=".75"/>
<path id="header-right" class="ColorScheme-Background" d="m51 12h6v32h-6z" fill="currentColor" opacity=".75"/>
<path id="header-top" class="ColorScheme-Background" d="m19 6h32v6h-32z" fill="currentColor" opacity=".75"/>
<g id="header-bottom">
<path id="rect3152" class="ColorScheme-Background" fill="currentColor" transform="rotate(90)" d="m43.999935-50.999989h6v32h-6z" opacity=".75"/>
<path id="rect3154" class="ColorScheme-Text" fill="currentColor" transform="rotate(90)" d="m48.99995-50.999989h1.000015v32h-1.000015z" opacity=".15"/>
<path id="rect3152" class="ColorScheme-Background" fill="currentColor" transform="rotate(90)" d="m44-51h6v32h-6z" opacity=".75"/>
<path id="rect3154" class="ColorScheme-Text" fill="currentColor" transform="rotate(90)" d="m49-51h1v32h-1z" opacity=".15"/>
</g>
<path id="header-left" class="ColorScheme-Background" transform="scale(-1)" d="m-18.999996-43.999916h6v32h-6z" fill="currentColor" opacity=".75"/>
<path id="header-left" class="ColorScheme-Background" transform="scale(-1)" d="m-19-44h6v32h-6z" fill="currentColor" opacity=".75"/>
<g id="header-bottomright">
<path id="path3176" class="ColorScheme-Background" fill="currentColor" d="m56.99997 43.99995h-6v6h6v-5z" opacity=".75"/>
<path id="path3178" class="ColorScheme-Text" fill="currentColor" d="m56.99997 48.99995h-5.99998v1h5.99998c0-1-2e-5 0 0-1z" fill-rule="evenodd" opacity=".15"/>
<path id="path3176" class="ColorScheme-Background" fill="currentColor" d="m57 44h-6v6h6v-5z" opacity=".75"/>
<path id="path3178" class="ColorScheme-Text" fill="currentColor" d="m57 49h-6v1h6c0-1-2e-5 0 0-1z" fill-rule="evenodd" opacity=".15"/>
</g>
<g id="header-bottomleft">
<path id="path3182" class="ColorScheme-Background" fill="currentColor" d="m18.999996 49.99992v-6h-6v6c5.999995 4e-5 0 0 4 0h1z" opacity=".75"/>
<path id="path3184" class="ColorScheme-Text" fill="currentColor" d="m18.999996 49.99994v-1h-4l-2-2e-5v1l2 2e-5h1z" fill-rule="evenodd" opacity=".15"/>
<path id="path3182" class="ColorScheme-Background" fill="currentColor" d="m19 50v-6h-6v6c6 4e-5 0 0 4 0h1z" opacity=".75"/>
<path id="path3184" class="ColorScheme-Text" fill="currentColor" d="m19 50v-1h-4l-2-2e-5v1l2 2e-5h1z" fill-rule="evenodd" opacity=".15"/>
</g>
<path id="header-topleft" class="ColorScheme-Background" d="m15.999995 5.99992c-2 0-3 1-3 3v3h6v-6h-1 1z" fill="currentColor" opacity=".75"/>
<path id="header-topright" class="ColorScheme-Background" d="m50.999995 5.99992v6h6v-3c0-2-1-3-3-3h-2z" fill="currentColor" opacity=".75"/>
<path id="footer-center" class="ColorScheme-Background" transform="scale(1 -1)" d="m66.790382-43.999939h32v32h-32z" fill="currentColor" opacity=".75"/>
<path id="footer-right" class="ColorScheme-Background" transform="scale(1 -1)" d="m98.790359-43.999939h6v32h-6z" fill="currentColor" opacity=".75"/>
<path id="footer-bottom" class="ColorScheme-Background" transform="matrix(0 1 1 0 0 0)" d="m43.999947 66.790359h6v32h-6z" fill="currentColor" opacity=".75"/>
<path id="header-topleft" class="ColorScheme-Background" d="m13 6h6v6h-6z" fill="currentColor" opacity=".75"/>
<path id="header-topright" class="ColorScheme-Background" d="m51 6h6v6h-6z" fill="currentColor" opacity=".75"/>
<path id="footer-center" class="ColorScheme-Background" transform="scale(1 -1)" d="m67-44h32v32h-32z" fill="currentColor" opacity=".75"/>
<path id="footer-right" class="ColorScheme-Background" transform="scale(1 -1)" d="m99-44h6v32h-6z" fill="currentColor" opacity=".75"/>
<path id="footer-bottom" class="ColorScheme-Background" transform="matrix(0 1 1 0 0 0)" d="m44 67h6v32h-6z" fill="currentColor" opacity=".75"/>
<g id="footer-top">
<path id="rect3152-0" class="ColorScheme-Background" fill="currentColor" transform="matrix(0 -1 -1 0 0 0)" d="m-11.999955-98.790314h6v32h-6z" opacity=".75"/>
<path id="rect3154-9" class="ColorScheme-Text" fill="currentColor" transform="matrix(0 -1 -1 0 0 0)" d="m-6.99994-98.790314h1.000015v32h-1.000015z" opacity=".15"/>
<path id="rect3152-0" class="ColorScheme-Background" fill="currentColor" transform="matrix(0 -1 -1 0 0 0)" d="m-12-99h6v32h-6z" opacity=".75"/>
<path id="rect3154-9" class="ColorScheme-Text" fill="currentColor" transform="matrix(0 -1 -1 0 0 0)" d="m-7-99h1v32h-1z" opacity=".15"/>
</g>
<path id="footer-left" class="ColorScheme-Background" transform="scale(-1 1)" d="m-66.790375 11.999983h6v32h-6z" fill="currentColor" opacity=".75"/>
<path id="footer-left" class="ColorScheme-Background" transform="scale(-1 1)" d="m-67 12h6v32h-6z" fill="currentColor" opacity=".75"/>
<g id="footer-topright">
<path id="path3176-6" class="ColorScheme-Background" fill="currentColor" d="m104.79032 11.99994h-6v-6h6v5z" opacity=".75"/>
<path id="path3178-2" class="ColorScheme-Text" fill="currentColor" d="m104.79032 6.99994h-5.99998v-1h5.99998c0 1-2e-5 0 0 1z" fill-rule="evenodd" opacity=".15"/>
<path id="path3176-6" class="ColorScheme-Background" fill="currentColor" d="m105 12h-6v-6h6v5z" opacity=".75"/>
<path id="path3178-2" class="ColorScheme-Text" fill="currentColor" d="m105 7h-6v-1h6c0 1-2e-5 0 0 1z" fill-rule="evenodd" opacity=".15"/>
</g>
<g id="footer-topleft">
<path id="path3182-1" class="ColorScheme-Background" fill="currentColor" d="m66.79038 5.99998v6h-6v-6c5.999995-4e-5 0 0 4 0h1z" opacity=".75"/>
<path id="path3184-8" class="ColorScheme-Text" fill="currentColor" d="m66.79038 5.99996v1h-4l-2 2e-5v-1l2-2e-5h1z" fill-rule="evenodd" opacity=".15"/>
<path id="path3182-1" class="ColorScheme-Background" fill="currentColor" d="m67 6v6h-6v-6c6-4e-5 0 0 4 0h1z" opacity=".75"/>
<path id="path3184-8" class="ColorScheme-Text" fill="currentColor" d="m67 6v1h-4l-2 2e-5v-1l2-2e-5h1z" fill-rule="evenodd" opacity=".15"/>
</g>
<path id="footer-bottomleft" class="ColorScheme-Background" d="m63.790377 49.99994c-2 0-3-1-3-3v-3h6v6h-1 1z" fill="currentColor" opacity=".75"/>
<path id="footer-bottomright" class="ColorScheme-Background" d="m98.790377 49.99994v-6h6.000003v3c0 2-1 3-3 3h-2.000003z" fill="currentColor" opacity=".75"/>
<path id="hint-top-margin" d="m33 11.981692h4v6.000025h-4z" fill="#f0f"/>
<path id="hint-bottom-margin" d="m33 37.981693h4v5.999975h-4z" fill="#f0f"/>
<path id="hint-right-margin" transform="rotate(90)" d="m25.981691-51h4v6.000015h-4z" fill="#f0f"/>
<path id="hint-left-margin" transform="rotate(90)" d="m25.981691-25.000004h4v6.000004h-4z" fill="#f0f"/>
<path id="footer-bottomleft" class="ColorScheme-Background" d="m61 44h6v6h-6z" fill="currentColor" opacity=".75"/>
<path id="footer-bottomright" class="ColorScheme-Background" d="m99 44h6v6h-6z" fill="currentColor" opacity=".75"/>
<path id="hint-top-margin" d="m33 12h4v6h-4z" fill="#f0f"/>
<path id="hint-bottom-margin" d="m33 38h4v6h-4z" fill="#f0f"/>
<path id="hint-right-margin" transform="rotate(90)" d="m26-51h4v6h-4z" fill="#f0f"/>
<path id="hint-left-margin" transform="rotate(90)" d="m26-25h4v6h-4z" fill="#f0f"/>
</svg>

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB