[graphics/krita] libs/ui: Change crosshair size, remove general settings currentIndex
Emmet O'Neill <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit 81805f5f0b8446c7140e9ebb456f29fc58e24411 by Emmet O'Neill, on behalf of Dat Le.
Committed on 13/08/2026 at 23:16.
Pushed by emmetoneill into branch 'master'.
Change crosshair size, remove general settings currentIndex
M +16 -19 libs/ui/forms/wdggeneralsettings.ui
M +4 -4 libs/ui/tool/KisAsyncColorSamplerHelper.cpp
https://invent.kde.org/graphics/krita/-/commit/81805f5f0b8446c7140e9ebb456f29fc58e24411
diff --git a/libs/ui/forms/wdggeneralsettings.ui b/libs/ui/forms/wdggeneralsettings.ui
index dea0942a449..c9a217f40c7 100644
--- a/libs/ui/forms/wdggeneralsettings.ui
+++ b/libs/ui/forms/wdggeneralsettings.ui
@@ -41,9 +41,6 @@
</property>
<item>
<widget class="QTabWidget" name="tabWidget">
- <property name="currentIndex">
- <number>3</number>
- </property>
<property name="movable">
<bool>false</bool>
</property>
@@ -303,7 +300,7 @@
</attribute>
<layout class="QFormLayout" name="formLayout">
<property name="labelAlignment">
- <set>Qt::AlignLeading</set>
+ <set>Qt::AlignmentFlag::AlignLeading</set>
</property>
<item row="0" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox_3">
@@ -416,7 +413,7 @@
</size>
</property>
<property name="frameShape">
- <enum>QFrame::NoFrame</enum>
+ <enum>QFrame::Shape::NoFrame</enum>
</property>
<property name="text">
<string/>
@@ -640,7 +637,7 @@
<item>
<spacer name="horizontalSpacer_4">
<property name="orientation">
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -669,7 +666,7 @@
<item row="5" column="0" colspan="2">
<spacer name="verticalSpacer_4">
<property name="orientation">
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -1239,7 +1236,7 @@
</property>
</widget>
</item>
- </layout>
+ </layout>
</widget>
</item>
</layout>
@@ -1291,7 +1288,7 @@
<item>
<spacer name="verticalSpacer_6">
<property name="orientation">
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -1347,7 +1344,7 @@
<item row="5" column="0" colspan="2">
<spacer name="verticalSpacer_5">
<property name="orientation">
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -1379,13 +1376,13 @@
<item>
<widget class="QScrollArea" name="scrollArea">
<property name="frameShape">
- <enum>QFrame::NoFrame</enum>
+ <enum>QFrame::Shape::NoFrame</enum>
</property>
<property name="horizontalScrollBarPolicy">
- <enum>Qt::ScrollBarAsNeeded</enum>
+ <enum>Qt::ScrollBarPolicy::ScrollBarAsNeeded</enum>
</property>
<property name="sizeAdjustPolicy">
- <enum>QAbstractScrollArea::AdjustIgnored</enum>
+ <enum>QAbstractScrollArea::SizeAdjustPolicy::AdjustIgnored</enum>
</property>
<property name="widgetResizable">
<bool>true</bool>
@@ -1490,7 +1487,7 @@
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -1560,7 +1557,7 @@
<item>
<spacer name="horizontalSpacer_3">
<property name="orientation">
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -1633,10 +1630,10 @@
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
+ <enum>QSizePolicy::Policy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -1789,7 +1786,7 @@ To restore the old behavior you can force Krita to use Display DPI for fonts by
<item>
<spacer name="horizontalSpacer_5">
<property name="orientation">
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -1818,7 +1815,7 @@ To restore the old behavior you can force Krita to use Display DPI for fonts by
<item row="15" column="0" colspan="2">
<spacer name="verticalSpacer">
<property name="orientation">
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
diff --git a/libs/ui/tool/KisAsyncColorSamplerHelper.cpp b/libs/ui/tool/KisAsyncColorSamplerHelper.cpp
index a1cbea9e848..aac74fbc075 100644
--- a/libs/ui/tool/KisAsyncColorSamplerHelper.cpp
+++ b/libs/ui/tool/KisAsyncColorSamplerHelper.cpp
@@ -251,12 +251,12 @@ struct KisAsyncColorSamplerHelper::Private
cacheCirclePreviewDiameter = circlePreviewDiameter;
- int gap = 5; // Should be odd so it have a center point
- int crosshairRadius = circlePreviewDiameter / 2 * 0.3;
+ int gapRadius = 3;
+ int crosshairRadius = circlePreviewDiameter / 2 * 0.2;
cacheCrosshairPath = QPainterPath(QPointF(-crosshairRadius, 0));
- cacheCrosshairPath.lineTo(-gap, 0);
- cacheCrosshairPath.moveTo(gap, 0);
+ cacheCrosshairPath.lineTo(-gapRadius, 0);
+ cacheCrosshairPath.moveTo(gapRadius, 0);
cacheCrosshairPath.lineTo(crosshairRadius, 0);
QTransform tf;