Added some Qt6 parameters

tsujan · Oct 18, 2022 · 251cd3f · 251cd3f
1 parent 88d474f
commit 251cd3f
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 4 deletions.
diff --git a/Kvantum/ChangeLog b/Kvantum/ChangeLog
@@ -1,7 +1,8 @@
 V1.0.6
 ---------
  * Added a workaround for Kate's new status-bar and side-pane buttons, which still have wrong style codes.
- * Updated a method that was deprecated by Qt 6.4.0.
+ * Added some Qt6 parameters.
+ * Silenced the compilation warnings with Qt 6.4.
 
 V1.0.5
 ---------

diff --git a/Kvantum/NEWS b/Kvantum/NEWS
@@ -1,5 +1,5 @@
 Latest version:
 
-	6 Oct 2022, V1.0.6
+	18 Oct 2022, V1.0.6
 
 See "ChangeLog" for changes.
diff --git a/Kvantum/style/Kvantum.cpp b/Kvantum/style/Kvantum.cpp
@@ -13233,6 +13233,11 @@ int Style::pixelMetric(QStyle::PixelMetric metric, const QStyleOption *option, c
 
     case PM_TreeViewIndentation : return 20;
 
+#if (QT_VERSION >= QT_VERSION_CHECK(6,3,0))
+    case PM_LineEditIconSize : return pixelMetric(PM_SmallIconSize);
+    case PM_LineEditIconMargin : return pixelMetric(PM_SmallIconSize) / 4;
+#endif
+
     default : return QCommonStyle::pixelMetric(metric,option,widget);
   }
 }
@@ -13446,6 +13451,12 @@ int Style::styleHint(QStyle::StyleHint hint,
 
     case SH_TabBar_ElideMode : return Qt::ElideNone; // don't interfere with CE_TabBarTabLabel
 
+#if (QT_VERSION >= QT_VERSION_CHECK(6,3,0))
+    case SH_TabBar_AllowWheelScrolling : return true;
+
+    case SH_Table_AlwaysDrawLeftTopGridLines : return false;
+#endif
+
     //case SH_ScrollBar_BackgroundMode : return Qt::OpaqueMode;
 
     case SH_ScrollBar_ContextMenu : return !tspec_.transient_scrollbar; // because of the hover bug
@@ -13550,8 +13561,6 @@ int Style::styleHint(QStyle::StyleHint hint,
       }
     }
 
-    //case SH_SpinControls_DisableOnBounds: return true;
-
     case SH_ToolTip_WakeUpDelay : {
       if (tspec_.tooltip_delay >= 0)
         return tspec_.tooltip_delay;
@@ -13565,7 +13574,11 @@ int Style::styleHint(QStyle::StyleHint hint,
 
     case SH_ToolBox_SelectedPageTitleBold : return true;
 
+    case SH_SpinControls_DisableOnBounds: return true;
     case SH_SpinBox_ButtonsInsideFrame : return true;
+#if (QT_VERSION >= QT_VERSION_CHECK(6,3,0))
+    case SH_SpinBox_SelectOnStep : return true;
+#endif
 
     /* forms */
     case SH_FormLayoutFieldGrowthPolicy : {

diff --git a/Kvantum/style/standardIcons.cpp b/Kvantum/style/standardIcons.cpp
@@ -574,6 +574,15 @@ QIcon Style::standardIcon(QStyle::StandardPixmap standardIcon,
       else break;
     }
 
+#if (QT_VERSION >= QT_VERSION_CHECK(6,3,0))
+    case SP_TabCloseButton : {
+      QIcon icn = QIcon::fromTheme(QStringLiteral("tab-close"),
+                                   QIcon::fromTheme(QStringLiteral("window-close")));
+      if (!icn.isNull()) return icn;
+      else break;
+    }
+#endif
+
     default : break;
   }