alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://invent.kde.org/frameworks/plasma-framework into work/marginareas

Browse Source
This commit is contained in:
Niccolò Venerandi 2020-11-18 23:03:56 +01:00
commit 3c92764b62
10 changed files with 57 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.5)
set(KF5_VERSION "5.76.0") # handled by release scripts
set(KF5_VERSION "5.77.0") # handled by release scripts
set(KF5_DEP_VERSION "5.76.0") # handled by release scripts
project(Plasma VERSION ${KF5_VERSION})

2
src/declarativeimports/plasmacomponents3/RoundButton.qml
View File

@ -28,7 +28,7 @@ T.RoundButton {
contentItem: RowLayout {
// This is the spacing which will make the icon a square inscribed in the circle with an extra smallspacing of margins
readonly property int extraSpace: width/2 - width/2*Math.sqrt(2)/2 + units.smallSpacing
readonly property int extraSpace: implicitWidth/2 - implicitWidth/2*Math.sqrt(2)/2 + units.smallSpacing
PlasmaCore.IconItem {
Layout.preferredWidth: units.iconSizes.smallMedium
Layout.preferredHeight: units.iconSizes.smallMedium

5
src/declarativeimports/plasmacomponents3/ScrollBar.qml
View File

@ -75,8 +75,11 @@ T.ScrollBar {
property real handleState: 0
visible: !controlRoot.interactive
x: Math.round(controlRoot.orientation == Qt.Vertical
? (parent.width - width) - (parent.width/2 - width/2) * handleState
? (Qt.application.layoutDirection === Qt.LeftToRight
? (parent.width - width) - (parent.width/2 - width/2) * handleState
: (parent.width/2 - width/2) * handleState)
: 0)
y: Math.round(controlRoot.orientation == Qt.Horizontal

1
src/declarativeimports/plasmacomponents3/ScrollView.qml
View File

@ -48,7 +48,6 @@ T.ScrollView {
readonly property Flickable flickableItem: controlRoot.contentItem
onFlickableItemChanged: {
flickableItem.clip = true;
flickableItem.pixelAligned = true;
}
parent: controlRoot
x: controlRoot.mirrored ? 0 : controlRoot.width - width

4
src/declarativeimports/plasmacomponents3/Slider.qml
View File

@ -71,7 +71,9 @@ T.Slider {
y: parent.horizontal ? (parent.height - height) / 2 : parent.height - height
width: Math.max(margins.left + margins.right,
parent.horizontal
? control.visualPosition * (parent.width - control.handle.width) + control.handle.width/2
? (Qt.application.layoutDirection === Qt.LeftToRight
? control.visualPosition * (parent.width - control.handle.width) + control.handle.width/2
: parent.width - control.visualPosition * (parent.width - control.handle.width) - control.handle.width/2)
: parent.width)
height: Math.max(margins.top + margins.bottom,
parent.horizontal

4
src/declarativeimports/plasmacomponents3/SpinBox.qml
View File

@ -60,10 +60,10 @@ T.SpinBox {
}
onWheel: {
if (wheel.angleDelta.y > 0 && control.value <= control.to) {
control.value += control.stepSize
control.value -= control.stepSize
control.valueModified()
} else if (wheel.angleDelta.y < 0 && control.value >= control.from) {
control.value -= control.stepSize
control.value += control.stepSize
control.valueModified()
}
}

4
src/declarativeimports/plasmacomponents3/TabButton.qml
View File

@ -32,7 +32,7 @@ T.TabButton {
PlasmaCore.IconItem {
id: icon
Layout.alignment: Qt.AlignCenter
Layout.alignment: control.display != T.AbstractButton.TextBesideIcon ? Qt.AlignCenter : Qt.AlignVCenter | Qt.AlignRight
Layout.fillWidth: true
Layout.fillHeight: true
@ -52,7 +52,7 @@ T.TabButton {
}
Label {
id: label
Layout.fillWidth: true
Layout.alignment: control.display != T.AbstractButton.TextBesideIcon || icon.source.length === 0 ? Qt.AlignCenter : Qt.AlignVCenter | Qt.AlignLeft
visible: text.length > 0 && control.display !== T.AbstractButton.IconOnly
text: control.Kirigami.MnemonicData.richTextLabel
font: control.font

9
src/declarativeimports/plasmacomponents3/ToolBar.qml
View File

@ -16,10 +16,10 @@ T.ToolBar {
implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
implicitContentHeight + topPadding + bottomPadding)
leftPadding: background.leftMargin
topPadding: background.topMargin
rightPadding: background.rightMargin
bottomPadding: background.bottomMargin
leftPadding: background.margins.left
topPadding: background.margins.top
rightPadding: background.margins.right
bottomPadding: background.margins.bottom
contentItem: Item { }
@ -27,7 +27,6 @@ T.ToolBar {
implicitHeight: 40 // TODO: Find a good way to sync this with the size of (Button or ToolButton) + padding
imagePath: "widgets/toolbar"
colorGroup: PlasmaCore.ColorScope.colorGroup
enabledBorders: control.position == T.ToolBar.Header ? PlasmaCore.FrameSvgItem.BottomBorder : PlasmaCore.FrameSvgItem.TopBorder
PlasmaCore.SvgItem {
svg: PlasmaCore.Svg {
imagePath: "widgets/listitem"

13
src/desktoptheme/breeze/icons/kup.svg Normal file
View File

@ -0,0 +1,13 @@
<svg id="svg2" version="1.1" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
<defs id="defs4">
<style id="current-color-scheme" type="text/css">.ColorScheme-Text {
color:#31363b;
}</style>
</defs>
<g id="kup" transform="translate(0,-1030.3621)">
<g id="vlc">
<path id="rect4246" class="ColorScheme-Text" d="m0 1030.3621h22v22h-22z" fill="none"/>
</g>
<path id="innershape" class="ColorScheme-Text" d="m11.0069 1036.3621c-2.205324 0-3.993093 1.7878-3.993093 3.9931s1.787769 3.9931 3.993093 3.9931 3.993094-1.7878 3.993094-3.9931-1.78777-3.9931-3.993094-3.9931zm-0.0069 1c1.837771 0 3 1.1622 3 3s-1.162229 3-3 3c-1.83777 0-3-1.1622-3-3s1.16223-3 3-3zm-1 1v3h3v-1l-1.9931-0.01-0.0069-1.9931zm-5-5v16h12v-16zm4 1h4a3 3 0 0 1 3 3v2.088a1.5 1.5 0 0 0-1 1.412 1.5 1.5 0 0 0 1 1.412v2.088l-2 2h-6l-2-2v-2.088a1.5 1.5 0 0 0 1-1.412 1.5 1.5 0 0 0-1-1.412v-2.088a3 3 0 0 1 3-3zm-2 13h4v1h-4zm6 0h2v1h-2z" fill="currentColor"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1010 B

105
src/desktoptheme/breeze/widgets/toolbar.svg
View File

@ -1,80 +1,29 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg id="svg2" sodipodi:version="0.32" inkscape:version="1.1-dev (fefa202dbf, 2020-10-11)" width="17" height="57" sodipodi:docname="toolbar.svg" inkscape:output_extension="org.inkscape.output.svgz.inkscape" inkscape:export-filename="/home/pinheiro/Documents/pics/estilo/plasma/wether.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" version="1.0" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
<sodipodi:namedview inkscape:window-height="830" inkscape:window-width="1408" inkscape:pageshadow="2" inkscape:pageopacity="1" guidetolerance="10.0" gridtolerance="10.0" objecttolerance="10.0" borderopacity="1.0" bordercolor="#666666" pagecolor="#b5b5b5" id="base" inkscape:zoom="13.153057" inkscape:cx="34.875467" inkscape:cy="61.853553" inkscape:window-x="264" inkscape:window-y="138" inkscape:current-layer="svg2" showgrid="true" showguides="true" inkscape:guide-bbox="true" inkscape:snap-guide="false" inkscape:snap-bbox="true" inkscape:object-paths="true" inkscape:bbox-nodes="false" inkscape:snap-global="true" inkscape:object-nodes="true" inkscape:window-maximized="0">
<inkscape:grid snapvisiblegridlinesonly="true" empspacing="5" enabled="true" visible="true" id="grid5592" type="xygrid" />
</sodipodi:namedview>
<metadata id="metadata7">
<rdf:RDF>
<cc:Work rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
<cc:Work rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<defs id="defs5">
<style id="current-color-scheme" type="text/css">
.ColorScheme-Text {
color:#31363b;
stop-color:#31363b;
}
.ColorScheme-Background {
color:#eff0f1;
stop-color:#eff0f1;
}
.ColorScheme-Highlight {
color:#3daee9;
stop-color:#3daee9;
}
.ColorScheme-ViewText {
color:#31363b;
stop-color:#31363b;
}
.ColorScheme-ViewBackground {
color:#fcfcfc;
stop-color:#fcfcfc;
}
.ColorScheme-ViewHover {
color:#93cee9;
stop-color:#93cee9;
}
.ColorScheme-ViewFocus{
color:#3daee9;
stop-color:#3daee9;
}
.ColorScheme-ButtonText {
color:#31363b;
stop-color:#31363b;
}
.ColorScheme-ButtonBackground {
color:#eff0f1;
stop-color:#eff0f1;
}
.ColorScheme-ButtonHover {
color:#93cee9;
stop-color:#93cee9;
}
.ColorScheme-ButtonFocus{
color:#3daee9;
stop-color:#3daee9;
}
</style>
</defs>
<rect style="opacity:1;fill:#4e9a06;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="hint-tile-center" width="2.0329318" height="2.077126" x="-2.7400386" y="-1.3405813" rx="0" ry="2.077126" />
<path inkscape:connector-curvature="0" id="center" d="m 2.9997,6.0000048 0,11.0000002 10.999999,0 0,-11.0000002 -10.999999,0 z" style="opacity:1;fill:currentColor;fill-opacity:1;fill-rule:nonzero;stroke:none" class="ColorScheme-Background" inkscape:label="#normal-center-8" />
<path inkscape:connector-curvature="0" id="right" d="m 13.9997,6.0000048 0,11.0000002 2,0 c 6.68e-4,-0.0183 0,-0.0344 0,-0.0529 l 0,-10.8942302 c 0,-0.0185 6.68e-4,-0.03453 0,-0.05288 l -2,0 z" style="opacity:1;fill:currentColor;fill-opacity:1;fill-rule:nonzero;stroke:none" class="ColorScheme-Background" inkscape:label="#normal-right-4" />
<path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" id="top" d="m 2.9997,3.9999578 0,2.000047 10.999999,0 0,-2.000047 c -0.0041,-6.7e-4 0.0042,0 1e-6,0 l -10.98814,0 c -0.004,0 -0.008,-6.7e-4 -0.0119,0 z" style="opacity:1;fill:currentColor;fill-opacity:1;fill-rule:nonzero;stroke:none" inkscape:label="#plain-top" class="ColorScheme-Background" />
<path inkscape:connector-curvature="0" id="left" d="m 1,6.0000048 c -6.7e-4,0.01835 0,0.03439 0,0.05288 L 1,16.947115 c 0,0.0185 -6.7e-4,0.0345 0,0.0529 l 2,0 0,-11.0000002 -2,0 z" style="opacity:1;fill:currentColor;fill-opacity:1;fill-rule:nonzero;stroke:none" class="ColorScheme-Background" inkscape:label="#normal-left-0" />
<path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="bottom" d="m 2.9997,16.999665 0,2 11,0 0,-1.99966 z" style="opacity:1;fill:currentColor;fill-opacity:1;fill-rule:nonzero;stroke:none" inkscape:label="#plain-bottom" class="ColorScheme-Background" />
<path style="opacity:1;fill:currentColor;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0.999667,3.9999578 0,2.000047 1.999771,0 0,-2.000047 c -7.46e-4,-6.7e-4 7.63e-4,0 0,0 l -1.997614,0 c -7.28e-4,0 -0.0015,-6.7e-4 -0.0022,0 z" id="topleft" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc" inkscape:label="#path3112" class="ColorScheme-Background" />
<path style="opacity:1;fill:currentColor;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 13.999707,4.0003028 0,1.999702 1.999771,0 0,-1.999702 c -7.46e-4,-6.7e-4 7.63e-4,0 0,0 l -1.997614,0 c -7.28e-4,0 -0.0015,-6.7e-4 -0.0022,0 z" id="topright" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc" inkscape:label="#path3118" class="ColorScheme-Background" />
<path sodipodi:nodetypes="ccccsscc" inkscape:connector-curvature="0" id="bottomright" d="m 13.999707,16.999955 0,1.99971 1.999771,0 0,-1.99971 c -7.46e-4,-6.7e-4 7.63e-4,0 0,0 l -1.997614,0 c -7.28e-4,0 -0.0015,-6.7e-4 -0.0022,0 z" style="opacity:1;fill:currentColor;fill-opacity:1;fill-rule:nonzero;stroke:none" inkscape:label="#path3130" class="ColorScheme-Background" />
<path style="opacity:1;fill:currentColor;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0.999707,16.999955 0,1.99971 1.999771,0 0,-1.99971 c -7.46e-4,-6.7e-4 7.63e-4,0 0,0 l -1.997614,0 c -7.28e-4,0 -0.0015,-6.7e-4 -0.0022,0 z" id="bottomleft" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccsscc" inkscape:label="#path3136" class="ColorScheme-Background" />
<rect style="fill:#0000ff;fill-rule:evenodd" id="hint-top-margin" width="1" height="2" x="7.5" y="4" />
<rect style="fill:#0000ff;fill-rule:evenodd" id="hint-left-margin" width="2" height="1" x="1" y="10" />
<rect style="fill:#0000ff;fill-rule:evenodd" id="hint-bottom-margin" width="1" height="2" x="7.5" y="17" />
<rect style="fill:#0000ff;fill-rule:evenodd" id="hint-right-margin" width="2" height="1" x="14" y="10" />
<svg id="svg2" height="40" width="40" version="1.1" sodipodi:docname="toolbar.svg" inkscape:version="1.1-dev (14859467fb, 2020-11-03)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
<defs id="defs20" />
<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="namedview18" showgrid="false" inkscape:current-layer="svg2" />
<style id="current-color-scheme" type="text/css">
.ColorScheme-Text {
color:#31363b;
stop-color:#31363b;
}
.ColorScheme-Background {
color:#eff0f1;
stop-color:#eff0f1;
}
</style>
<rect id="hint-tile-center" fill="#4e9a06" height="2" rx="0" ry="2" width="2" x="-2" y="-2" />
<rect id="center" height="32" width="32" x="4" y="4" class="ColorScheme-Background" fill="currentColor"/>
<rect id="right" height="32" width="4" x="36" y="4" class="ColorScheme-Background" fill="currentColor"/>
<rect id="top" height="4" width="32" x="4" y="0" class="ColorScheme-Background" fill="currentColor"/>
<rect id="left" height="32" width="4" x="0" y="4" class="ColorScheme-Background" fill="currentColor"/>
<rect id="bottom" height="4" width="32" x="4" y="36" class="ColorScheme-Background" fill="currentColor"/>
<rect id="topleft" height="4" width="4" x="0" y="0" class="ColorScheme-Background" fill="currentColor"/>
<rect id="topright" height="4" width="4" x="36" y="0" class="ColorScheme-Background" fill="currentColor"/>
<rect id="bottomright" height="4" width="4" x="36" y="36" class="ColorScheme-Background" fill="currentColor"/>
<rect id="bottomleft" height="4" width="4" x="0" y="36" class="ColorScheme-Background" fill="currentColor"/>
<path id="hint-top-margin" d="m20 0h2v4h-2z" fill="#00f" fill-rule="evenodd" />
<path id="hint-left-margin" d="m0 18h4v2h-4z" fill="#00f" fill-rule="evenodd" />
<path id="hint-bottom-margin" d="m20 36h2v4h-2z" fill="#00f" fill-rule="evenodd" />
<path id="hint-right-margin" d="m36 18h4v2h-4z" fill="#00f" fill-rule="evenodd" />
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.9 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB