From 56c8b28b6ae8e0daa83eb83fe1325c293ccaf871 Mon Sep 17 00:00:00 2001 From: Hugo Pereira Da Costa Date: Mon, 4 Aug 2014 09:56:20 +0200 Subject: [PATCH] added more pixelmetrics --- kstyle/breezemetrics.h | 3 +-- kstyle/breezestyle.cpp | 30 +++++++++++++++++++++++++++--- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/kstyle/breezemetrics.h b/kstyle/breezemetrics.h index 5344bcb9..4179d95c 100644 --- a/kstyle/breezemetrics.h +++ b/kstyle/breezemetrics.h @@ -37,8 +37,7 @@ namespace Breeze // layout Layout_TopLevelMarginWidth = 10, Layout_ChildMarginWidth = 6, - Layout_HorizontalSpacing = 6, - Layout_VerticalSpacing = 6, + Layout_DefaultSpacing = 6, // line editors LineEdit_MarginWidth = 6, diff --git a/kstyle/breezestyle.cpp b/kstyle/breezestyle.cpp index 631dda0d..973eafa5 100644 --- a/kstyle/breezestyle.cpp +++ b/kstyle/breezestyle.cpp @@ -281,8 +281,8 @@ namespace Breeze } - case PM_LayoutHorizontalSpacing: return Metrics::Layout_HorizontalSpacing; - case PM_LayoutVerticalSpacing: return Metrics::Layout_VerticalSpacing; + case PM_LayoutHorizontalSpacing: return Metrics::Layout_DefaultSpacing; + case PM_LayoutVerticalSpacing: return Metrics::Layout_DefaultSpacing; // buttons case PM_ButtonMargin: return Metrics::Button_MarginWidth; @@ -368,10 +368,17 @@ namespace Breeze return false; } - // mouse tracking + // combobox case SH_ComboBox_ListMouseTracking: return true; + + // menubar case SH_MenuBar_MouseTracking: return true; + + // menu case SH_Menu_MouseTracking: return true; + case SH_Menu_SubMenuPopupDelay: return 150; + case SH_Menu_SloppySubMenus: return true; + case SH_Menu_SupportsSections: return true; // groupboxes case SH_GroupBox_TextLabelVerticalAlignment: return Qt::AlignVCenter; @@ -382,6 +389,23 @@ namespace Breeze // scrollbars case SH_ScrollBar_MiddleClickAbsolutePosition: return true; + // forms + case SH_FormLayoutFormAlignment: return Qt::AlignLeft | Qt::AlignTop; + case SH_FormLayoutLabelAlignment: return Qt::AlignRight; + case SH_FormLayoutFieldGrowthPolicy: return QFormLayout::ExpandingFieldsGrow; + case SH_FormLayoutWrapPolicy: return QFormLayout::DontWrapRows; + + // message box + case SH_MessageBox_TextInteractionFlags: return Qt::TextSelectableByMouse | Qt::LinksAccessibleByMouse; + + // dialog buttons + case SH_ProgressDialog_CenterCancelButton: + case SH_MessageBox_CenterButtons: + return false; + + // input panel + case SH_RequestSoftwareInputPanel: return RSIP_OnMouseClick; + // fallback default: return KStyle::styleHint( hint, option, widget, returnData );