New Upstream Snapshot - qt5-style-kvantum
Ready changes
Summary
Merged new upstream version: 1.0.7+git20230107.1.83830a3 (was: 1.0.7).
Resulting package
Built on 2023-01-19T11:59 (took 12m4s)
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t fresh-snapshots qt5-style-kvantum-dbgsymapt install -t fresh-snapshots qt5-style-kvantum-l10napt install -t fresh-snapshots qt5-style-kvantum-themesapt install -t fresh-snapshots qt5-style-kvantum
Lintian Result
- qt5-style-kvantum-dbgsym_1.0.7+git20230107.1.83830a3-1~jan+nus1_amd64.deb
- qt5-style-kvantum-l10n_1.0.7+git20230107.1.83830a3-1~jan+nus1_all.deb
- qt5-style-kvantum-themes_1.0.7+git20230107.1.83830a3-1~jan+nus1_all.deb
- qt5-style-kvantum_1.0.7+git20230107.1.83830a3-1~jan+nus1.dsc
- qt5-style-kvantum_1.0.7+git20230107.1.83830a3-1~jan+nus1_amd64.buildinfo
- qt5-style-kvantum_1.0.7+git20230107.1.83830a3-1~jan+nus1_amd64.deb
- qt5-style-kvantum_1.0.7+git20230107.1.83830a3-1~jan+nus1_amd64.changes
Diff
diff --git a/Kvantum/ChangeLog b/Kvantum/ChangeLog
index a6c052c..b698196 100644
--- a/Kvantum/ChangeLog
+++ b/Kvantum/ChangeLog
@@ -1,3 +1,10 @@
+V1.0.8
+---------
+ * Fixed combo-box status under Wayland.
+ * Fixed dragging of inactive windows of multi-window apps under Wayland.
+ * Fixed a miscalculation about setting menu-item height in a rare case.
+ * Workaround for Qt's hover bug in header views (especially under Wayland).
+
V1.0.7
---------
* Don't rely on the (undocumented) "Destroy" event to remove destroyed widgets from lists. In this way, the cause of a rare crash is removed.
diff --git a/Kvantum/NEWS b/Kvantum/NEWS
index 0237561..1c7e39e 100644
--- a/Kvantum/NEWS
+++ b/Kvantum/NEWS
@@ -1,5 +1,5 @@
Latest version:
- 20 Nov 2022, V1.0.7
+ 7 Jan 2023, V1.0.8
See "ChangeLog" for changes.
diff --git a/Kvantum/kvantummanager/data/translations/kvantummanager_da.ts b/Kvantum/kvantummanager/data/translations/kvantummanager_da.ts
index 4267806..4bd70b1 100644
--- a/Kvantum/kvantummanager/data/translations/kvantummanager_da.ts
+++ b/Kvantum/kvantummanager/data/translations/kvantummanager_da.ts
@@ -103,7 +103,7 @@ indstillinger af dette tema.
<message>
<location filename="../../kvantummanager.ui" line="332"/>
<source>Ctrl+Z</source>
- <translation type="unfinished">Ctrl+Z</translation>
+ <translation>Ctrl+Z</translation>
</message>
<message>
<location filename="../../kvantummanager.ui" line="342"/>
@@ -121,7 +121,7 @@ indstillinger af dette tema.
<message>
<location filename="../../kvantummanager.ui" line="349"/>
<source>Ctrl+S</source>
- <translation type="unfinished">Ctrl+S</translation>
+ <translation>Ctrl+S</translation>
</message>
<message>
<location filename="../../kvantummanager.ui" line="356"/>
@@ -131,7 +131,7 @@ indstillinger af dette tema.
<message>
<location filename="../../kvantummanager.ui" line="369"/>
<source>Hacks</source>
- <translation type="unfinished">Hacks</translation>
+ <translation>Hacks</translation>
</message>
<message>
<location filename="../../kvantummanager.ui" line="396"/>
diff --git a/Kvantum/kvantummanager/main.cpp b/Kvantum/kvantummanager/main.cpp
index a586523..49dec78 100644
--- a/Kvantum/kvantummanager/main.cpp
+++ b/Kvantum/kvantummanager/main.cpp
@@ -27,7 +27,7 @@
int main (int argc, char *argv[])
{
const QString name = "Kvantum Manager";
- const QString version = "1.0.7";
+ const QString version = "1.0.8";
QStringList options;
for (int i = 1; i < argc; ++i)
diff --git a/Kvantum/kvantumpreview/KvantumPreview.h b/Kvantum/kvantumpreview/KvantumPreview.h
index fd312b6..bb983f3 100644
--- a/Kvantum/kvantumpreview/KvantumPreview.h
+++ b/Kvantum/kvantumpreview/KvantumPreview.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) Pedram Pourang (aka Tsu Jan) 2014 <tsujan2000@gmail.com>
+ * Copyright (C) Pedram Pourang (aka Tsu Jan) 2014-2023 <tsujan2000@gmail.com>
*
* Kvantum is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -30,9 +30,9 @@ class KvantumPreview : public QMainWindow, private Ui::KvantumPreviewBase {
Q_OBJECT
public:
- KvantumPreview (QWidget *parent = 0) : QMainWindow (parent)
- {
+ KvantumPreview (QWidget *parent = nullptr) : QMainWindow (parent) {
setupUi (this);
+
QList<int> sizes; sizes << 50 << 50;
splitter->setSizes (sizes);
splitter_2->setSizes (sizes);
@@ -135,9 +135,11 @@ private slots:
tabWidget_6->setTabsClosable (false);
tabWidget_6->setTabsClosable (true);
}
+
void KvDocMode (bool checked) {
tabWidget->setDocumentMode (checked);
}
+
void docMode (bool checked) {
tabWidget_2->setDocumentMode (checked);
tabWidget_3->setDocumentMode (checked);
@@ -145,6 +147,7 @@ private slots:
tabWidget_5->setDocumentMode (checked);
tabWidget_6->setDocumentMode (checked);
}
+
void makeFlat (bool checked) {
pushButton->setFlat (checked);
pushButton_4->setFlat (checked);
@@ -159,6 +162,7 @@ private slots:
pushButton_7->setFlat (checked);
pushButton_8->setFlat (checked);
}
+
void makeAutoRaise (bool checked) {
toolButton->setAutoRaise (checked);
toolButton_2->setAutoRaise (checked);
@@ -179,6 +183,7 @@ private slots:
toolButton_17->setAutoRaise (checked);
toolButton_18->setAutoRaise (checked);
}
+
void setDisabledState (int state) {
checkBox_8->setCheckState(static_cast<Qt::CheckState>(state));
}
diff --git a/Kvantum/kvantumpreview/data/translations/kvantumpreview_ca.ts b/Kvantum/kvantumpreview/data/translations/kvantumpreview_ca.ts
index 53f2e5f..bc5bb90 100644
--- a/Kvantum/kvantumpreview/data/translations/kvantumpreview_ca.ts
+++ b/Kvantum/kvantumpreview/data/translations/kvantumpreview_ca.ts
@@ -51,8 +51,8 @@ l'amplada</translation>
<location filename="../../KvantumPreviewBase.ui" line="152"/>
<source>Multi-line
push button</source>
- <translation type="unfinished">Multilínia
-botó de prémer</translation>
+ <translation>Multilínia
+botó premut</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="160"/>
@@ -152,7 +152,7 @@ al costat del text</translation>
<message>
<location filename="../../KvantumPreviewBase.ui" line="366"/>
<source>Push button with menu</source>
- <translation type="unfinished">Botó per prémer amb el menú</translation>
+ <translation>Botó de pressió amb el menú</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="415"/>
@@ -165,7 +165,7 @@ height
greater
than
width</source>
- <translation type="unfinished">Botó
+ <translation>Botó
d'eina
de commutació
@@ -183,7 +183,7 @@ l'amplada</translation>
<message>
<location filename="../../KvantumPreviewBase.ui" line="825"/>
<source>Radio/Check buttons</source>
- <translation type="unfinished">Botons d'opció/verificació</translation>
+ <translation>Botons d'opció/verificació</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="846"/>
diff --git a/Kvantum/kvantumpreview/data/translations/kvantumpreview_da.ts b/Kvantum/kvantumpreview/data/translations/kvantumpreview_da.ts
index 551f477..e9078e2 100644
--- a/Kvantum/kvantumpreview/data/translations/kvantumpreview_da.ts
+++ b/Kvantum/kvantumpreview/data/translations/kvantumpreview_da.ts
@@ -146,12 +146,13 @@ og rullemenu pil</translation>
<location filename="../../KvantumPreviewBase.ui" line="552"/>
<source>Toolbutton with 32px PNG icon
beside text</source>
- <translation type="unfinished"></translation>
+ <translation>Værktøjsknap med 32px PNG ikon
+ved siden af tekst</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="366"/>
<source>Push button with menu</source>
- <translation type="unfinished"></translation>
+ <translation>Trykknap med menu</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="415"/>
@@ -164,66 +165,76 @@ height
greater
than
width</source>
- <translation type="unfinished"></translation>
+ <translation>Skift
+værktøjs
+knap
+
+til
+højde
+større
+end
+bredde</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="804"/>
<source>Auto-raise</source>
- <translation type="unfinished"></translation>
+ <translation>Automatisk hævning</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="825"/>
<source>Radio/Check buttons</source>
- <translation type="unfinished"></translation>
+ <translation>Radio/Check knapper</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="846"/>
<location filename="../../KvantumPreviewBase.ui" line="859"/>
<source>Simple radio button</source>
- <translation type="unfinished"></translation>
+ <translation>Simpel radioknap</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="869"/>
<location filename="../../KvantumPreviewBase.ui" line="880"/>
<source>Multi-line
radio button</source>
- <translation type="unfinished"></translation>
+ <translation>flerstrenget
+Radio knap</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="891"/>
<location filename="../../KvantumPreviewBase.ui" line="917"/>
<source>Radio button with 32px SVG icon</source>
- <translation type="unfinished"></translation>
+ <translation>Radio knap med 32px SVG ikon</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="940"/>
<location filename="../../KvantumPreviewBase.ui" line="953"/>
<source>Simple check box</source>
- <translation type="unfinished"></translation>
+ <translation>Simpelt afkrydsningsfelt</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="963"/>
<location filename="../../KvantumPreviewBase.ui" line="974"/>
<source>Multi-line
check box</source>
- <translation type="unfinished"></translation>
+ <translation>flerstrenget
+afkrydsningsfelt</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="982"/>
<location filename="../../KvantumPreviewBase.ui" line="995"/>
<source>Tri-state check box</source>
- <translation type="unfinished"></translation>
+ <translation>Tre tilstande afkrydsningsfelt</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="1005"/>
<location filename="../../KvantumPreviewBase.ui" line="1019"/>
<source>Check box with icon</source>
- <translation type="unfinished"></translation>
+ <translation>Afkrydsningsfelt med ikon</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="1075"/>
<source>Combos/Spins/Inputs</source>
- <translation type="unfinished"></translation>
+ <translation>Kombinationer/Kørende/Valg</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="1109"/>
@@ -233,37 +244,37 @@ check box</source>
<location filename="../../KvantumPreviewBase.ui" line="1450"/>
<location filename="../../KvantumPreviewBase.ui" line="1508"/>
<source>Frameless (no difference)</source>
- <translation type="unfinished"></translation>
+ <translation>Rammeløs (ingen forskel)</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="1120"/>
<location filename="../../KvantumPreviewBase.ui" line="1159"/>
<source>Standard combo box</source>
- <translation type="unfinished"></translation>
+ <translation>Standard kombinationsboks</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="1129"/>
<location filename="../../KvantumPreviewBase.ui" line="1168"/>
<source>Standard combo box 1</source>
- <translation type="unfinished"></translation>
+ <translation>Standard kombinationsboks 1</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="1137"/>
<location filename="../../KvantumPreviewBase.ui" line="1173"/>
<source>Standard combo box 2</source>
- <translation type="unfinished"></translation>
+ <translation>Standard kombinationsboks 2</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="1142"/>
<location filename="../../KvantumPreviewBase.ui" line="1178"/>
<source>Standard combo box 3</source>
- <translation type="unfinished"></translation>
+ <translation>Standard kombinationsboks 3</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="1147"/>
<location filename="../../KvantumPreviewBase.ui" line="1183"/>
<source>Standard combo box 4</source>
- <translation type="unfinished"></translation>
+ <translation>Standard kombinationsboks 4</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="1204"/>
@@ -271,7 +282,7 @@ check box</source>
<location filename="../../KvantumPreviewBase.ui" line="1387"/>
<location filename="../../KvantumPreviewBase.ui" line="1459"/>
<source>Frameless 1</source>
- <translation type="unfinished"></translation>
+ <translation>Rammeløs 1</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="1209"/>
@@ -279,7 +290,7 @@ check box</source>
<location filename="../../KvantumPreviewBase.ui" line="1392"/>
<location filename="../../KvantumPreviewBase.ui" line="1464"/>
<source>Frameless 2</source>
- <translation type="unfinished"></translation>
+ <translation>Rammeløs 2</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="1214"/>
@@ -287,7 +298,7 @@ check box</source>
<location filename="../../KvantumPreviewBase.ui" line="1397"/>
<location filename="../../KvantumPreviewBase.ui" line="1469"/>
<source>Frameless 3</source>
- <translation type="unfinished"></translation>
+ <translation>Rammeløs 3</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="1219"/>
@@ -295,207 +306,207 @@ check box</source>
<location filename="../../KvantumPreviewBase.ui" line="1402"/>
<location filename="../../KvantumPreviewBase.ui" line="1474"/>
<source>Frameless 4</source>
- <translation type="unfinished"></translation>
+ <translation>Rammeløs 4</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="1224"/>
<location filename="../../KvantumPreviewBase.ui" line="1407"/>
<source>Frameless 5</source>
- <translation type="unfinished"></translation>
+ <translation>Rammeløs 5</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="1229"/>
<location filename="../../KvantumPreviewBase.ui" line="1412"/>
<source>Frameless 6</source>
- <translation type="unfinished"></translation>
+ <translation>Rammeløs 6</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="1234"/>
<location filename="../../KvantumPreviewBase.ui" line="1417"/>
<source>Frameless 7</source>
- <translation type="unfinished"></translation>
+ <translation>Rammeløs 7</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="1239"/>
<location filename="../../KvantumPreviewBase.ui" line="1422"/>
<source>Frameless 8</source>
- <translation type="unfinished"></translation>
+ <translation>Rammeløs 8</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="1244"/>
<location filename="../../KvantumPreviewBase.ui" line="1427"/>
<source>Frameless 9</source>
- <translation type="unfinished"></translation>
+ <translation>Rammeløs 9</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="1249"/>
<location filename="../../KvantumPreviewBase.ui" line="1432"/>
<source>Frameless 10</source>
- <translation type="unfinished"></translation>
+ <translation>Rammeløs 10</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="1300"/>
<location filename="../../KvantumPreviewBase.ui" line="1339"/>
<source>Editable combo box</source>
- <translation type="unfinished"></translation>
+ <translation>Redigerbar kombinationsboks</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="1309"/>
<location filename="../../KvantumPreviewBase.ui" line="1348"/>
<source>Editable combo box 1</source>
- <translation type="unfinished"></translation>
+ <translation>Redigerbar kombinationsboks 1</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="1314"/>
<location filename="../../KvantumPreviewBase.ui" line="1353"/>
<source>Editable combo box 2</source>
- <translation type="unfinished"></translation>
+ <translation>Redigerbar kombinationsboks 2</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="1319"/>
<location filename="../../KvantumPreviewBase.ui" line="1358"/>
<source>Editable combo box 3</source>
- <translation type="unfinished"></translation>
+ <translation>Redigerbar kombinationsboks 3</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="1324"/>
<location filename="../../KvantumPreviewBase.ui" line="1363"/>
<source>Editable combo box 4</source>
- <translation type="unfinished"></translation>
+ <translation>Redigerbar kombinationsboks 4</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="1482"/>
<location filename="../../KvantumPreviewBase.ui" line="1495"/>
<source>Line-edit</source>
- <translation type="unfinished"></translation>
+ <translation>Linjeredigering</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="1574"/>
<source>Sliders/Scrolls/Progress/Dial</source>
- <translation type="unfinished"></translation>
+ <translation>Skydere/Scrolls/Status/Tast</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="2131"/>
<source>Containers</source>
- <translation type="unfinished"></translation>
+ <translation>Containere</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="2152"/>
<source>Header 1</source>
- <translation type="unfinished"></translation>
+ <translation>Header 1</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="2161"/>
<source>Header 2</source>
- <translation type="unfinished"></translation>
+ <translation>Header 2</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="2169"/>
<source>Header 3</source>
- <translation type="unfinished"></translation>
+ <translation>Header 3</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="2174"/>
<location filename="../../KvantumPreviewBase.ui" line="2272"/>
<source>3rd Item</source>
- <translation type="unfinished"></translation>
+ <translation>3. Genstand</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="2182"/>
<location filename="../../KvantumPreviewBase.ui" line="2260"/>
<source>2nd Item</source>
- <translation type="unfinished"></translation>
+ <translation>2. Genstand</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="2186"/>
<location filename="../../KvantumPreviewBase.ui" line="2222"/>
<source>2nd Child</source>
- <translation type="unfinished"></translation>
+ <translation>2. Underligende</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="2191"/>
<location filename="../../KvantumPreviewBase.ui" line="2227"/>
<source>1st Child</source>
- <translation type="unfinished"></translation>
+ <translation>1. Underligende</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="2197"/>
<location filename="../../KvantumPreviewBase.ui" line="2245"/>
<source>1st Item</source>
- <translation type="unfinished"></translation>
+ <translation>1. Punkt</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="2217"/>
<source>3rd Child</source>
- <translation type="unfinished"></translation>
+ <translation>3. Underligende</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="2515"/>
<source>Row 0</source>
- <translation type="unfinished"></translation>
+ <translation>Række 0</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="2520"/>
<source>Row 1</source>
- <translation type="unfinished"></translation>
+ <translation>Række 1</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="2525"/>
<source>Column 0</source>
- <translation type="unfinished"></translation>
+ <translation>Kolonne 0</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="2533"/>
<source>Column 1</source>
- <translation type="unfinished"></translation>
+ <translation>Kolonne 1</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="2538"/>
<source>0-0</source>
- <translation type="unfinished"></translation>
+ <translation>0-0</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="2546"/>
<source>0-1</source>
- <translation type="unfinished"></translation>
+ <translation>0-1</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="2554"/>
<source>1-0</source>
- <translation type="unfinished"></translation>
+ <translation>1-0</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="2562"/>
<source>1-1</source>
- <translation type="unfinished"></translation>
+ <translation>1-1</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="2204"/>
<location filename="../../KvantumPreviewBase.ui" line="2207"/>
<source>Editable</source>
- <translation type="unfinished"></translation>
+ <translation>Redigerbar</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="2234"/>
<source>Non-Editable</source>
- <translation type="unfinished"></translation>
+ <translation>Ikke redigerbar</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="2282"/>
<source>Subwindow</source>
- <translation type="unfinished"></translation>
+ <translation>Undervindue</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="2329"/>
<source>Panel frame</source>
- <translation type="unfinished"></translation>
+ <translation>Panelramme</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="2348"/>
<location filename="../../KvantumPreviewBase.ui" line="2489"/>
<location filename="../../KvantumPreviewBase.ui" line="2581"/>
<source>GroupBox</source>
- <translation type="unfinished"></translation>
+ <translation>Gruppeboks</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="2368"/>
@@ -504,12 +515,12 @@ check box</source>
<location filename="../../KvantumPreviewBase.ui" line="2791"/>
<location filename="../../KvantumPreviewBase.ui" line="2839"/>
<source>Tab 1</source>
- <translation type="unfinished"></translation>
+ <translation>Tab 1</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="2374"/>
<source>Page 1 (disabled)</source>
- <translation type="unfinished"></translation>
+ <translation>Side 1 (deaktiveret)</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="2386"/>
@@ -518,12 +529,12 @@ check box</source>
<location filename="../../KvantumPreviewBase.ui" line="2805"/>
<location filename="../../KvantumPreviewBase.ui" line="2853"/>
<source>Tab 2</source>
- <translation type="unfinished"></translation>
+ <translation>Tab 2</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="2392"/>
<source>Page 2 (disabled)</source>
- <translation type="unfinished"></translation>
+ <translation>Side 2 (deaktiveret)</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="2426"/>
@@ -532,7 +543,7 @@ check box</source>
<location filename="../../KvantumPreviewBase.ui" line="2797"/>
<location filename="../../KvantumPreviewBase.ui" line="2845"/>
<source>Page 1</source>
- <translation type="unfinished"></translation>
+ <translation>Side 1</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="2440"/>
@@ -542,132 +553,132 @@ check box</source>
<location filename="../../KvantumPreviewBase.ui" line="2811"/>
<location filename="../../KvantumPreviewBase.ui" line="2859"/>
<source>Page 2</source>
- <translation type="unfinished"></translation>
+ <translation>Side 2</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="2464"/>
<source>Stack widget (page1)</source>
- <translation type="unfinished"></translation>
+ <translation>Indbygget widget (side 1)</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="2478"/>
<source>Stack Widget (page2)</source>
- <translation type="unfinished"></translation>
+ <translation>Indbygget widget (side 2)</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="2495"/>
<source>Group box</source>
- <translation type="unfinished"></translation>
+ <translation>Gruppeboks</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="2573"/>
<source>Dock Widget</source>
- <translation type="unfinished"></translation>
+ <translation>Flydende Widget</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="2590"/>
<source>Checkable group box</source>
- <translation type="unfinished"></translation>
+ <translation>Afkrydsningsbar gruppeboks</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="2625"/>
<source>Tool Box</source>
- <translation type="unfinished"></translation>
+ <translation>Værktøjskasse</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="2720"/>
<source>Document mode</source>
- <translation type="unfinished"></translation>
+ <translation>Dokumenttilstand</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="2758"/>
<source>Box frame</source>
- <translation type="unfinished"></translation>
+ <translation>Kasseramme</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="2888"/>
<source>&File</source>
- <translation type="unfinished"></translation>
+ <translation>&Fil</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="2892"/>
<source>&Submenu</source>
- <translation type="unfinished"></translation>
+ <translation>&Undermenu</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="2912"/>
<source>toolBar</source>
- <translation type="unfinished"></translation>
+ <translation>Værktøjslinje</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="2932"/>
<source>toolBar_2</source>
- <translation type="unfinished"></translation>
+ <translation>Værktøjslinje_2</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="2954"/>
<source>&Quit</source>
- <translation type="unfinished"></translation>
+ <translation>&Afslut</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="2957"/>
<source>Quit</source>
- <translation type="unfinished"></translation>
+ <translation>Afslut</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="2960"/>
<source>Ctrl+Q</source>
- <translation type="unfinished"></translation>
+ <translation>Ctrl+Q</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="2968"/>
<source>&Checkbox</source>
- <translation type="unfinished"></translation>
+ <translation>&Afkrydsningsfelt</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="2981"/>
<source>Toggle Layout</source>
- <translation type="unfinished"></translation>
+ <translation>Skift layout</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="2984"/>
<source>Toggle layout direction</source>
- <translation type="unfinished"></translation>
+ <translation>Skift layoutretning</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="2996"/>
<source>&Doc Mode</source>
- <translation type="unfinished"></translation>
+ <translation>&Dokumenttilstand</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="2999"/>
<source>Show tabs in the document mode</source>
- <translation type="unfinished"></translation>
+ <translation>Vis faner i dokumenttilstand</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="3011"/>
<source>Menu Button</source>
- <translation type="unfinished"></translation>
+ <translation>Menu knap</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="3014"/>
<source>Hold pressed to show a menu</source>
- <translation type="unfinished"></translation>
+ <translation>Hold nede for at vise en menu</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="3025"/>
<source>C&heckbox</source>
- <translation type="unfinished"></translation>
+ <translation>Af&krydsningsfelt</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="3033"/>
<source>&Radio button</source>
- <translation type="unfinished"></translation>
+ <translation>&Radio knap</translation>
</message>
<message>
<location filename="../../KvantumPreviewBase.ui" line="3041"/>
<source>Radio &button</source>
- <translation type="unfinished"></translation>
+ <translation>Radio &knap</translation>
</message>
</context>
</TS>
diff --git a/Kvantum/kvantumpreview/main.cpp b/Kvantum/kvantumpreview/main.cpp
index 6c5cb9b..382baff 100644
--- a/Kvantum/kvantumpreview/main.cpp
+++ b/Kvantum/kvantumpreview/main.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) Pedram Pourang (aka Tsu Jan) 2014 <tsujan2000@gmail.com>
+ * Copyright (C) Pedram Pourang (aka Tsu Jan) 2014-2023 <tsujan2000@gmail.com>
*
* Kvantum is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -23,8 +23,8 @@
int main (int argc, char *argv[])
{
- QApplication::setApplicationName ("KvantumViewer");
- QApplication viewer (argc,argv);
+ QApplication viewer (argc, argv);
+ viewer.setApplicationName ("Kvantum Preview");
#if (QT_VERSION < QT_VERSION_CHECK(6,0,0))
viewer.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
#endif
@@ -32,7 +32,7 @@ int main (int argc, char *argv[])
QStringList langs (QLocale::system().uiLanguages());
QString lang; // bcp47Name() doesn't work under vbox
if (!langs.isEmpty())
- lang = langs.first().replace ('-', '_');
+ lang = langs.first().replace ('-', '_');
QTranslator qtTranslator;
#if (QT_VERSION < QT_VERSION_CHECK(6,0,0))
if (!qtTranslator.load ("qt_" + lang, QLibraryInfo::location (QLibraryInfo::TranslationsPath)))
@@ -60,7 +60,7 @@ int main (int argc, char *argv[])
#endif
viewer.installTranslator (&KPTranslator);
- KvantumPreview k (NULL);
+ KvantumPreview k (nullptr);
k.show();
QList<QTabWidget *> list = k.findChildren<QTabWidget*>();
if (!list.isEmpty())
diff --git a/Kvantum/style/Kvantum.cpp b/Kvantum/style/Kvantum.cpp
index 4fb909e..80e2e3c 100644
--- a/Kvantum/style/Kvantum.cpp
+++ b/Kvantum/style/Kvantum.cpp
@@ -1855,6 +1855,14 @@ static inline bool isCursorOutsideWidget(const QWidget *widget)
: QCursor::pos()));
}
+static inline bool isCursorOutsideRect(const QWidget *widget, const QRect &rect)
+{ // used for woking around Qt's hover bug
+ if (widget == nullptr) return false;
+ QScreen *scr = widget->screen();
+ return !rect.contains(widget->mapFromGlobal(scr != nullptr ? QCursor::pos(scr)
+ : QCursor::pos()));
+}
+
void Style::drawPrimitive(QStyle::PrimitiveElement element,
const QStyleOption *option,
QPainter *painter,
@@ -3413,10 +3421,14 @@ void Style::drawPrimitive(QStyle::PrimitiveElement element,
baseCol.setAlpha(255);
painter->fillRect(option->rect, baseCol);
}
- bool animate(!pcmanfmInactiveView
- && widget && widget->isEnabled()
- && ((animatedWidget_ == widget && !fStatus.startsWith(QLatin1String("normal")))
- || (animatedWidgetOut_ == widget && fStatus.startsWith(QLatin1String("normal")))));
+ bool canAnimate(!pcmanfmInactiveView && widget && widget->isEnabled());
+ bool animate(canAnimate
+ && ((animatedWidget_ == widget
+ && opacityTimer_->isActive()
+ && !fStatus.startsWith(QLatin1String("normal")))
+ || (animatedWidgetOut_ == widget
+ && opacityTimerOut_->isActive()
+ && fStatus.startsWith(QLatin1String("normal")))));
QString animationStartState(animationStartState_);
int animationOpacity = animationOpacity_;
if (animate)
@@ -3451,6 +3463,13 @@ void Style::drawPrimitive(QStyle::PrimitiveElement element,
animationStartState_ = fStatus;
}
}
+ else if (canAnimate)
+ {
+ if (animatedWidget_ == widget)
+ animationStartState_ = fStatus;
+ if (animatedWidgetOut_ == widget)
+ animationStartStateOut_ = fStatus;
+ }
if (!(option->state & State_Enabled))
painter->restore();
}
@@ -3844,12 +3863,21 @@ void Style::drawPrimitive(QStyle::PrimitiveElement element,
painter->setOpacity(DISABLED_OPACITY);
}
bool animateSpin(qobject_cast<QAbstractSpinBox*>(p)
- && ((animatedWidget_ == p && !leStatus.startsWith(QLatin1String("normal")))
- || (animatedWidgetOut_ == p && leStatus.startsWith(QLatin1String("normal")))));
- bool animate(/*!isLibreoffice_ &&*/ widget && widget->isEnabled()
- && !qobject_cast<const QAbstractScrollArea*>(widget)
- && ((animatedWidget_ == widget && !leStatus.startsWith(QLatin1String("normal")))
- || (animatedWidgetOut_ == widget && leStatus.startsWith(QLatin1String("normal")))
+ && ((animatedWidget_ == p
+ && opacityTimer_->isActive()
+ && !leStatus.startsWith(QLatin1String("normal")))
+ || (animatedWidgetOut_ == p
+ && opacityTimerOut_->isActive()
+ && leStatus.startsWith(QLatin1String("normal")))));
+ bool canAnimate(/*!isLibreoffice_ &&*/ widget && widget->isEnabled()
+ && !qobject_cast<const QAbstractScrollArea*>(widget));
+ bool animate(canAnimate
+ && ((animatedWidget_ == widget
+ && opacityTimer_->isActive()
+ && !leStatus.startsWith(QLatin1String("normal")))
+ || (animatedWidgetOut_ == widget
+ && opacityTimerOut_->isActive()
+ && leStatus.startsWith(QLatin1String("normal")))
|| animateSpin));
QString animationStartState(animationStartState_);
int animationOpacity = animationOpacity_;
@@ -3897,6 +3925,19 @@ void Style::drawPrimitive(QStyle::PrimitiveElement element,
animationStartState_ = leStatus;
}
}
+ else if (canAnimate)
+ {
+ if (animatedWidget_ == widget
+ || (qobject_cast<QAbstractSpinBox*>(p) && animatedWidget_ == p))
+ {
+ animationStartState_ = leStatus;
+ }
+ if (animatedWidgetOut_ == widget
+ || (qobject_cast<QAbstractSpinBox*>(p) && animatedWidget_ == p))
+ {
+ animationStartStateOut_ = leStatus;
+ }
+ }
if (fillWidgetInterior) // widget isn't null
{
QColor baseCol = widget->palette().color(leStatus.contains(QLatin1String("-inactive"))
@@ -4257,6 +4298,12 @@ void Style::drawPrimitive(QStyle::PrimitiveElement element,
if (!elementExists(dspec.element+"-down-toggled"))
aStatus.replace(QLatin1String("toggled"),QLatin1String("pressed"));
}
+ else if (aStatus.startsWith(QLatin1String("focused"))
+ && option->styleObject != nullptr
+ && option->styleObject->property("_kv_hover_bug").toBool()) // hover bug
+ {
+ aStatus.replace(QLatin1String("focused"),QLatin1String("normal"));
+ }
if (opt->sortIndicator == QStyleOptionHeader::SortDown)
renderIndicator(painter,option->rect,fspec,dspec,dspec.element+"-down-"+aStatus,option->direction);
else if (opt->sortIndicator == QStyleOptionHeader::SortUp)
@@ -4419,7 +4466,10 @@ void Style::drawPrimitive(QStyle::PrimitiveElement element,
status = (option->state & State_Enabled) ?
(option->state & State_On) ? "toggled" :
((option->state & State_Sunken) || cb->hasFocus()) ? "pressed" :
- (option->state & State_MouseOver) ? "focused" : "normal"
+ (option->state & State_MouseOver)
+ && !(option->styleObject
+ && option->styleObject->property("_kv_hover_bug").toBool()) // hover bug
+ ? "focused" : "normal"
: "disabled";
if (isWidgetInactive(widget))
status.append("-inactive");
@@ -4656,12 +4706,14 @@ void Style::drawPrimitive(QStyle::PrimitiveElement element,
painter->setOpacity(DISABLED_OPACITY);
}
bool mouseAnimation(animatedWidget_ == widget
+ && opacityTimer_->isActive()
&& (!status.startsWith(QLatin1String("normal"))
|| animationStartState_.startsWith(QLatin1String("focused"))));
bool animate(cb && cb->isEnabled()
- && !qobject_cast<const QAbstractScrollArea*>(widget)
&& (mouseAnimation
- || (animatedWidgetOut_ == widget && status.startsWith(QLatin1String("normal")))));
+ || (animatedWidgetOut_ == widget
+ && opacityTimerOut_->isActive()
+ && status.startsWith(QLatin1String("normal")))));
QString animationStartState(animationStartState_);
if (animationStartState.startsWith(QLatin1String("c-")))
animationStartState.remove(0, 2);
@@ -4726,6 +4778,17 @@ void Style::drawPrimitive(QStyle::PrimitiveElement element,
animationStartStateOut_ = status;
}
}
+ else if (cb && cb->isEnabled())
+ {
+ if (animatedWidget_ == widget)
+ {
+ animationStartState_ = status;
+ if (animationStartState_.startsWith(QLatin1String("toggled")))
+ animationStartState_ = "c-" + animationStartState_;
+ }
+ if (animatedWidgetOut_ == widget)
+ animationStartStateOut_ = status;
+ }
if (fillWidgetInterior) // widget isn't null
{
QColor comboCol = widget->palette().color(status.contains(QLatin1String("-inactive"))
@@ -6525,7 +6588,7 @@ void Style::drawControl(QStyle::ControlElement element,
&& option->styleObject->property("_kv_hover_bug").toBool()) // hover bug
? "focused" :
(option->state & State_Sunken)
- // to know it has focus
+ // to know whether it has keyboard focus
|| (option->state & State_Selected) ? "pressed" : "normal"
: "disabled";
if (isWidgetInactive(widget))
@@ -8672,8 +8735,11 @@ void Style::drawControl(QStyle::ControlElement element,
painter->save();
painter->setOpacity(DISABLED_OPACITY);
}
- bool animate(widget && widget->isEnabled() && animatedWidget_ == widget
- && !qobject_cast<const QAbstractScrollArea*>(widget));
+ bool canAnimate(widget && widget->isEnabled()
+ && !qobject_cast<const QAbstractScrollArea*>(widget));
+ bool animate(canAnimate
+ && animatedWidget_ == widget
+ && opacityTimer_->isActive());
if (animate)
{
qreal opacity = painter->opacity();
@@ -8695,6 +8761,8 @@ void Style::drawControl(QStyle::ControlElement element,
if (animationOpacity_ >= 100)
animationStartState_ = sStatus;
}
+ else if (canAnimate)
+ animationStartState_ = sStatus;
QSize indicatorSize(r.width() - fspec.left-fspec.right,
qMin(dspec.size, r.height() - fspec.top-fspec.bottom));
if (tspec_.center_scrollbar_indicator)
@@ -8804,6 +8872,17 @@ void Style::drawControl(QStyle::ControlElement element,
}
QString status = getState(option,widget);
+ if (QObject *styleObject = option->styleObject)
+ {
+ if (status.startsWith(QLatin1String("focused"))
+ && isCursorOutsideRect(widget, option->rect))
+ { // hover bug
+ styleObject->setProperty("_kv_hover_bug", true);
+ status.replace(QLatin1String("focused"),QLatin1String("normal"));
+ }
+ else
+ styleObject->setProperty("_kv_hover_bug", QVariant());
+ }
if (!(option->state & State_Enabled))
{
status.replace(QLatin1String("disabled"),QLatin1String("normal"));
@@ -8946,7 +9025,13 @@ void Style::drawControl(QStyle::ControlElement element,
else if (status.startsWith(QLatin1String("toggled")))
state = 4;
else if (status.startsWith(QLatin1String("focused")))
- state = 2;
+ {
+ if (option->styleObject == nullptr
+ || !option->styleObject->property("_kv_hover_bug").toBool()) // hover bug
+ {
+ state = 2;
+ }
+ }
QSize iconSize = QSize(smallIconSize,smallIconSize);
bool isInactive(status.contains(QLatin1String("-inactive")));
@@ -11080,10 +11165,15 @@ void Style::drawComplexControl(QStyle::ComplexControl control,
painter->save();
painter->setOpacity(DISABLED_OPACITY);
}
- bool animate(widget && widget->isEnabled()
- && !qobject_cast<const QAbstractScrollArea*>(widget)
- && ((animatedWidget_ == widget && !leStatus.startsWith(QLatin1String("normal")))
- || (animatedWidgetOut_ == widget && leStatus.startsWith(QLatin1String("normal")))));
+ bool canAnimate(widget && widget->isEnabled()
+ && !qobject_cast<const QAbstractScrollArea*>(widget));
+ bool animate(canAnimate
+ && ((animatedWidget_ == widget
+ && opacityTimer_->isActive()
+ && !leStatus.startsWith(QLatin1String("normal")))
+ || (animatedWidgetOut_ == widget
+ && opacityTimerOut_->isActive()
+ && leStatus.startsWith(QLatin1String("normal")))));
QString animationStartState(animationStartState_);
int animationOpacity = animationOpacity_;
@@ -11125,6 +11215,13 @@ void Style::drawComplexControl(QStyle::ComplexControl control,
animationStartState_ = leStatus;
}
}
+ else if (canAnimate)
+ {
+ if (animatedWidget_ == widget)
+ animationStartState_ = leStatus;
+ if (animatedWidgetOut_ == widget)
+ animationStartStateOut_ = leStatus;
+ }
if (fillWidgetInterior) // widget isn't null
{
QColor baseCol = widget->palette().color(leStatus.contains(QLatin1String("-inctive"))
@@ -11249,33 +11346,34 @@ void Style::drawComplexControl(QStyle::ComplexControl control,
(option->state & State_On) ? "toggled" :
(option->state & State_MouseOver) ? "focused" :
(option->state & State_Sunken)
- // to know it has focus
+ // to know whether it has keyboard focus
|| (option->state & State_Selected) ? "pressed" : "normal"
: "disabled";
if (QObject *styleObject = option->styleObject)
{ // hover bug
if (status == "focused")
{
- if (styleObject->property("_kv_state").toString() == "sunken"
- && isCursorOutsideWidget(widget))
+ if (/*styleObject->property("_kv_state").toString() == "sunken"
+ && */isCursorOutsideWidget(widget))
{
styleObject->setProperty("_kv_hover_bug", true);
- styleObject->setProperty("_kv_state", QVariant());
- status = "normal";
+ //styleObject->setProperty("_kv_state", QVariant());
+ status = (option->state & State_Sunken)
+ || (option->state & State_Selected) ? "pressed" : "normal";
}
else
{
styleObject->setProperty("_kv_hover_bug", QVariant());
- styleObject->setProperty("_kv_state", QVariant());
+ //styleObject->setProperty("_kv_state", QVariant());
}
}
else
{
styleObject->setProperty("_kv_hover_bug", QVariant());
- if (status == "normal")
+ /*if (status == "normal")
styleObject->setProperty("_kv_state", QVariant());
else
- styleObject->setProperty("_kv_state", "sunken"); // includes the disabled state too
+ styleObject->setProperty("_kv_state", "sunken");*/ // includes the disabled state too
}
}
if (isWidgetInactive(widget))
@@ -11417,13 +11515,17 @@ void Style::drawComplexControl(QStyle::ComplexControl control,
rtl ? editWidth-o.rect.width() : 0, 0);
}
bool mouseAnimation(animatedWidget_ == widget
+ && opacityTimer_->isActive()
&& (!status.startsWith(QLatin1String("normal"))
|| ((!editable || !drwaAsLineEdit
|| (cb->view() && cb->view()->isVisible()))
- && animationStartState_.startsWith(QLatin1String("focused")))));
+ && (animationStartState_.startsWith(QLatin1String("focused"))
+ || animationStartState_.startsWith(QLatin1String("c-"))))));
bool animate(cb && cb->isEnabled()
&& (mouseAnimation
- || (animatedWidgetOut_ == widget && status.startsWith(QLatin1String("normal")))));
+ || (animatedWidgetOut_ == widget
+ && opacityTimerOut_->isActive()
+ && status.startsWith(QLatin1String("normal")))));
QString animationStartState(animationStartState_);
if (animationStartState.startsWith(QLatin1String("c-")))
animationStartState.remove(0, 2);
@@ -11517,6 +11619,17 @@ void Style::drawComplexControl(QStyle::ComplexControl control,
animationStartState_ = "c-" + animationStartState_;
}
}
+ else if (cb && cb->isEnabled())
+ {
+ if (animatedWidget_ == widget)
+ {
+ animationStartState_ = status;
+ if (animationStartState_.startsWith(QLatin1String("toggled")))
+ animationStartState_ = "c-" + animationStartState_;
+ }
+ if (animatedWidgetOut_ == widget)
+ animationStartStateOut_ = status;
+ }
if (fillWidgetInterior) // widget isn't null
{
QColor comboCol;
@@ -12272,8 +12385,11 @@ void Style::drawComplexControl(QStyle::ComplexControl control,
}
QString status = getState(option,widget);
- bool animate(widget && widget->isEnabled() && animatedWidget_ == widget
- && !qobject_cast<const QAbstractScrollArea*>(widget));
+ bool canAnimate(widget && widget->isEnabled()
+ && !qobject_cast<const QAbstractScrollArea*>(widget));
+ bool animate(canAnimate
+ && animatedWidget_ == widget
+ && opacityTimer_->isActive());
if (animate)
{
if (animationStartState_ == status)
@@ -12294,6 +12410,8 @@ void Style::drawComplexControl(QStyle::ComplexControl control,
if (animationOpacity_ >= 100)
animationStartState_ = status;
}
+ else if (canAnimate)
+ animationStartState_ = status;
// a decorative indicator if its element exists
const indicator_spec dspec = getIndicatorSpec(group);
@@ -14168,7 +14286,7 @@ QSize Style::sizeFromContents(QStyle::ContentsType type,
const indicator_spec dspec = getIndicatorSpec(group);
/* we also add 2px for the right margin. */
s.rwidth() += dspec.size + lspec.tispace + 2;
- s.rheight() += (dspec.size > s.height() ? dspec.size : 0);
+ s.setHeight(qMax(s.height(), dspec.size));
}
if (!(tspec_.combo_menu
@@ -14186,7 +14304,7 @@ QSize Style::sizeFromContents(QStyle::ContentsType type,
&& (opt->checkType == QStyleOptionMenuItem::Exclusive
|| opt->checkType == QStyleOptionMenuItem::NonExclusive))
{
- s.rheight() += (cSize > s.height() ? cSize : 0);
+ s.setHeight(qMax(s.height(), cSize));
}
}
diff --git a/Kvantum/style/drag/windowmanager.cpp b/Kvantum/style/drag/windowmanager.cpp
index 09e6d77..ae77ca0 100644
--- a/Kvantum/style/drag/windowmanager.cpp
+++ b/Kvantum/style/drag/windowmanager.cpp
@@ -335,35 +335,33 @@ bool WindowManager::mousePressEvent (QObject *object, QEvent *event)
/* find the widget */
QWidget *widget = nullptr;
- QWidget *activeWin = qApp->activeWindow();
- if (!activeWin)
+ /* NOTE: Under Wayland, if the window was inactive before being dragged, it may still
+ be inactive when this function is called. Moreover, the app may have multiple
+ windows and the mouse may have been pressed on an inactive one. Therefore,
+ we can't rely on QApplication::activeWindow() to find the widget.
+
+ On the other hand, QApplication::widgetAt() isn't reliable either because it
+ calls QApplication::topLevelAt(), which is useless under Wayland.
+
+ Checking all top level widgets is our only option. it works under X11 too. */
+ QWidget *topLevelWidget = nullptr;
+ const auto tlws = qApp->topLevelWidgets();
+ for (const auto tlw : tlws)
{
- /* This can happen under Wayland if the window is inactive before being
- dragged. QApplication::widgetAt() is fast because the window can't have
- "Qt::WA_TransparentForMouseEvents" (-> Qt -> QApplication::widgetAt). */
-#if (QT_VERSION < QT_VERSION_CHECK(6,0,0))
- widget = qApp->widgetAt (mouseEvent->globalPos());
-#else
- widget = qApp->widgetAt (mouseEvent->globalPosition().toPoint());
-#endif
+ if (tlw->windowHandle() == w)
+ {
+ topLevelWidget = tlw;
+ break;
+ }
}
- else
- {
+ if (!topLevelWidget) return false;
#if (QT_VERSION < QT_VERSION_CHECK(6,0,0))
- widget = activeWin->childAt (activeWin->mapFromGlobal (mouseEvent->globalPos()));
+ widget = topLevelWidget->childAt (topLevelWidget->mapFromGlobal (mouseEvent->globalPos()));
#else
- widget = activeWin->childAt (activeWin->mapFromGlobal (mouseEvent->globalPosition()).toPoint());
+ widget = topLevelWidget->childAt (topLevelWidget->mapFromGlobal (mouseEvent->globalPosition()).toPoint());
#endif
- if (!widget)
- widget = activeWin;
- }
- if (!widget
- /* this condition is especially needed under Wayland because
- "QMouseEvent::globalPosition()" isn't reliable there */
- || widget->window()->windowHandle() != w)
- {
- return false;
- }
+ if (!widget)
+ widget = topLevelWidget;
#if (QT_VERSION < QT_VERSION_CHECK(6,0,0))
widgetDragPoint_ = widget->mapFromGlobal (mouseEvent->globalPos()); // needed by canDrag()
diff --git a/Kvantum/themes/kvthemes/KvMojaveLight/KvMojaveLight.kvconfig b/Kvantum/themes/kvthemes/KvMojaveLight/KvMojaveLight.kvconfig
index 9631395..8a1715d 100644
--- a/Kvantum/themes/kvthemes/KvMojaveLight/KvMojaveLight.kvconfig
+++ b/Kvantum/themes/kvthemes/KvMojaveLight/KvMojaveLight.kvconfig
@@ -66,7 +66,7 @@ reduce_menu_opacity=0
[GeneralColors]
window.color=#ebebeb
-inactive.window.color=#ebebeb
+inactive.window.color=#e6e6e6
base.color=#ffffffcc
inactive.base.color=#fafafacc
alt.base.color=#f3f3f3
diff --git a/Kvantum/themes/kvthemes/KvMojaveMixed/KvMojaveMixed.kvconfig b/Kvantum/themes/kvthemes/KvMojaveMixed/KvMojaveMixed.kvconfig
index b5c9fa4..72b0b6a 100644
--- a/Kvantum/themes/kvthemes/KvMojaveMixed/KvMojaveMixed.kvconfig
+++ b/Kvantum/themes/kvthemes/KvMojaveMixed/KvMojaveMixed.kvconfig
@@ -71,7 +71,7 @@ shadowless_popup=false
[GeneralColors]
window.color=#ebebeb
-inactive.window.color=#ebebeb
+inactive.window.color=#e6e6e6
base.color=#ffffffcc
inactive.base.color=#fafafacc
alt.base.color=#f3f3f3
diff --git a/Kvantum/themes/kvthemes/KvMojaveMixed1/KvMojaveMixed1.kvconfig b/Kvantum/themes/kvthemes/KvMojaveMixed1/KvMojaveMixed1.kvconfig
index c9acac9..4922576 100644
--- a/Kvantum/themes/kvthemes/KvMojaveMixed1/KvMojaveMixed1.kvconfig
+++ b/Kvantum/themes/kvthemes/KvMojaveMixed1/KvMojaveMixed1.kvconfig
@@ -72,7 +72,7 @@ scrollable_menu=true
[GeneralColors]
window.color=#ebebeb
-inactive.window.color=#ebebeb
+inactive.window.color=#e6e6e6
base.color=#ffffffcc
inactive.base.color=#fafafacc
alt.base.color=#f3f3f3
diff --git a/debian/changelog b/debian/changelog
index 4271193..2d9e257 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+qt5-style-kvantum (1.0.7+git20230107.1.83830a3-1) UNRELEASED; urgency=low
+
+ * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk> Thu, 19 Jan 2023 11:49:59 -0000
+
qt5-style-kvantum (1.0.7-1) unstable; urgency=medium
[ Debian Janitor ]