commit plasma5-desktop for openSUSE:Factory
Hello community, here is the log from the commit of package plasma5-desktop for openSUSE:Factory checked in at 2018-03-02 21:09:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasma5-desktop (Old) and /work/SRC/openSUSE:Factory/.plasma5-desktop.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "plasma5-desktop" Fri Mar 2 21:09:39 2018 rev:79 rq:581718 version:5.12.2 Changes: -------- --- /work/SRC/openSUSE:Factory/plasma5-desktop/plasma5-desktop.changes 2018-02-28 19:59:01.368016195 +0100 +++ /work/SRC/openSUSE:Factory/.plasma5-desktop.new/plasma5-desktop.changes 2018-03-02 21:09:41.205302257 +0100 @@ -1,0 +2,6 @@ +Thu Mar 1 14:03:24 UTC 2018 - fabian@ritter-vogt.de + +- Backport upstream commit to move the toolbox away from the desktop icons: + * 0001-Place-toolbox-in-the-top-right-corner-of-the-screen.patch + +------------------------------------------------------------------- New: ---- 0001-Place-toolbox-in-the-top-right-corner-of-the-screen.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma5-desktop.spec ++++++ --- /var/tmp/diff_new_pack.QyA5co/_old 2018-03-02 21:09:42.137268743 +0100 +++ /var/tmp/diff_new_pack.QyA5co/_new 2018-03-02 21:09:42.141268599 +0100 @@ -35,6 +35,7 @@ Patch1: 0001-Use-themed-user-face-icon-in-kickoff.patch # PATCHES 100-200 and above are from upstream 5.12 branch # PATCHES 201-300 and above are from upstream master/5.13 branch +Patch201: 0001-Place-toolbox-in-the-top-right-corner-of-the-screen.patch %if 0%{?suse_version} > 1325 BuildRequires: libboost_headers-devel %else @@ -177,7 +178,7 @@ %lang_package %prep %setup -q -n plasma-desktop-%{version} -%patch1 -p1 +%autopatch -p1 # Workaround for boo#1038368 sed -i"" "s/Name=Desktop/Name=Desktop Containment/g" containments/desktop/package/metadata.desktop ++++++ 0001-Place-toolbox-in-the-top-right-corner-of-the-screen.patch ++++++
From 295cba58c8f0ccdf414df1e32ac31c4840835f53 Mon Sep 17 00:00:00 2001 From: Kai Uwe Broulik <kde@privat.broulik.de> Date: Fri, 23 Feb 2018 11:37:02 +0100 Subject: [PATCH] Place toolbox in the top right corner of the screen
This moves it out of the way of desktop icons and is also what Plasma 4 did. The code is adjusted to mirror the position for right-to-left languages. BUG: 390038 FIXED-IN: 5.13.0 Differential Revision: https://phabricator.kde.org/D10563 --- containments/desktop/package/contents/config/main.xml | 2 +- toolboxes/desktoptoolbox/contents/ui/ToolBoxRoot.qml | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/containments/desktop/package/contents/config/main.xml b/containments/desktop/package/contents/config/main.xml index 6830fb02..8356d283 100644 --- a/containments/desktop/package/contents/config/main.xml +++ b/containments/desktop/package/contents/config/main.xml @@ -20,7 +20,7 @@ </entry> <entry name="ToolBoxButtonState" type="String"> <label>Position state of the toolbox button.</label> - <default>topleft</default> + <default></default> </entry> <entry name="ToolBoxButtonX" type="int"> <label>X coordinate of the toolbox.</label> diff --git a/toolboxes/desktoptoolbox/contents/ui/ToolBoxRoot.qml b/toolboxes/desktoptoolbox/contents/ui/ToolBoxRoot.qml index d7c638d4..55abcd7a 100644 --- a/toolboxes/desktoptoolbox/contents/ui/ToolBoxRoot.qml +++ b/toolboxes/desktoptoolbox/contents/ui/ToolBoxRoot.qml @@ -140,6 +140,16 @@ Item { } function placeToolBox(ts) { + // if nothing has been setup yet, determin default position based on layout direction + if (!ts) { + if (Qt.application.layoutDirection === Qt.RightToLeft) { + placeToolBox("topleft"); + } else { + placeToolBox("topright"); + } + return; + } + var tx = Plasmoid.configuration.ToolBoxButtonX var ty = Plasmoid.configuration.ToolBoxButtonY var pos; -- 2.16.1
participants (1)
-
root@hilbert.suse.de