Dessa/gentoo
1
0
Fork 0
Code Issues Pull Requests Wiki Activity

[lxqt] commit 0.12 without Manifest

Browse Source
This commit is contained in:
Robert Förster
2018-05-20 21:17:54 +02:00
parent e9dfc5a3b9
commit 84ad97d931
22 changed files with 217 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lxqt-base/lxqt-panel/files/lxqt-panel-0.11.0-fix-undef-explicit.patch
View File

@@ -1,32 +0,0 @@
From ec62109e0fa678875a9b10fc6f1975267432712d Mon Sep 17 00:00:00 2001
From: Palo Kisa <palo.kisa@gmail.com>
Date: Mon, 30 Jan 2017 12:21:10 +0100
Subject: [PATCH] plugin-kbindicator: Undef the "explicit" workaround
..after include and add explanation of the workaround.
closes lxde/lxqt#1251
---
plugin-kbindicator/src/x11/kbdlayout.cpp | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/plugin-kbindicator/src/x11/kbdlayout.cpp b/plugin-kbindicator/src/x11/kbdlayout.cpp
index c4aa4e27..883df074 100644
--- a/plugin-kbindicator/src/x11/kbdlayout.cpp
+++ b/plugin-kbindicator/src/x11/kbdlayout.cpp
@@ -33,8 +33,15 @@
#include <xkbcommon/xkbcommon-x11.h>
#include <xcb/xcb.h>
+
+// Note: We need to override "explicit" as this is a C++ keyword. But it is
+// used as variable name in xkb.h. This is causing a failure in C++ compile
+// time.
+// Similar bug here: https://bugs.freedesktop.org/show_bug.cgi?id=74080
#define explicit _explicit
#include <xcb/xkb.h>
+#undef explicit
+
#include "../kbdinfo.h"
#include "../controls.h"

30
lxqt-base/lxqt-panel/files/lxqt-panel-0.12.0-fix-worldclock-size-updating.patch Normal file
View File

@@ -0,0 +1,30 @@
From c9df6bc1c79e1032ff9750f14165dd7bdd67b53c Mon Sep 17 00:00:00 2001
From: Palo Kisa <palo.kisa@gmail.com>
Date: Mon, 23 Oct 2017 10:30:04 +0200
Subject: [PATCH] worldclock: Fix widget size updating
If the content change resulted in need of different size to show all
the content, the parent widget(s) didn't get the change. This resulted
in cut text or waste of space in panel.
---
plugin-worldclock/lxqtworldclock.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/plugin-worldclock/lxqtworldclock.cpp b/plugin-worldclock/lxqtworldclock.cpp
index 34c36967..d6fe9c07 100644
--- a/plugin-worldclock/lxqtworldclock.cpp
+++ b/plugin-worldclock/lxqtworldclock.cpp
@@ -132,9 +132,13 @@ void LXQtWorldClock::updateTimeText()
if (!isUpToDate)
{
+ const QSize old_size = mContent->sizeHint();
mContent->setText(tzNow.toString(preformat(mFormat, timeZone, tzNow)));
+ if (old_size != mContent->sizeHint())
+ mRotatedWidget->adjustContentSize();
mRotatedWidget->update();
updatePopupContent();
+
}
}

35
lxqt-base/lxqt-panel/files/lxqt-panel-0.12.0-fix-wrongly-positioned-popups.patch Normal file
View File

@@ -0,0 +1,35 @@
From 7391172f5c60bfdb62c71f832c4ee4a4477366a2 Mon Sep 17 00:00:00 2001
From: Palo Kisa <palo.kisa@gmail.com>
Date: Tue, 14 Nov 2017 09:12:34 +0100
Subject: [PATCH] lxqtpanel: Fix wrongly positioned popups
..by avoiding of usage the QWidget::mapToGlobal(), which is unreliable
sometimes.
---
panel/lxqtpanel.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/panel/lxqtpanel.cpp b/panel/lxqtpanel.cpp
index 24a27155..7a33e05d 100644
--- a/panel/lxqtpanel.cpp
+++ b/panel/lxqtpanel.cpp
@@ -987,7 +987,8 @@ void LXQtPanel::setReserveSpace(bool reserveSpace, bool save)
************************************************/
QRect LXQtPanel::globalGometry() const
{
- return QRect(mapToGlobal(QPoint(0, 0)), this->size());
+ // panel is the the top-most widget/window, no calculation needed
+ return geometry();
}
@@ -1204,7 +1205,8 @@ QRect LXQtPanel::calculatePopupWindowPos(const ILXQtPanelPlugin *plugin, const Q
return QRect();
}
- return calculatePopupWindowPos(panel_plugin->mapToGlobal(QPoint(0, 0)), windowSize);
+ // Note: assuming there are not contentMargins around the "BackgroundWidget" (LXQtPanelWidget)
+ return calculatePopupWindowPos(globalGometry().topLeft() + panel_plugin->geometry().topLeft(), windowSize);
}