diff options
Diffstat (limited to 'kstyles/keramik')
| -rw-r--r-- | kstyles/keramik/keramik.cpp | 57 | ||||
| -rw-r--r-- | kstyles/keramik/keramik.h | 3 |
2 files changed, 11 insertions, 49 deletions
diff --git a/kstyles/keramik/keramik.cpp b/kstyles/keramik/keramik.cpp index af9866c2f..6d46df973 100644 --- a/kstyles/keramik/keramik.cpp +++ b/kstyles/keramik/keramik.cpp @@ -284,7 +284,6 @@ KeramikStyle::KeramikStyle() toolbarBlendWidget(0), titleBarMode(None), flatMode(false), customScrollMode(false), kickerMode(false) { forceSmallMode = false; - hoverWidget = 0; TQSettings settings; @@ -1368,9 +1367,6 @@ void KeramikStyle::drawControl( TQ_ControlElement element, if (isFormWidget(btn)) formMode = true; - if ( widget == hoverWidget ) - flags |= Style_MouseOver; - if ( btn->isFlat( ) ) flatMode = true; @@ -1514,28 +1510,26 @@ void KeramikStyle::drawControl( TQ_ControlElement element, case CE_TabBarTab: { - const TQTabBar* tabBar = static_cast< const TQTabBar* >( widget ); - - bool bottom = tabBar->shape() == TQTabBar::RoundedBelow || - tabBar->shape() == TQTabBar::TriangularBelow; + bool bottom = ceData.tabBarData.shape == TQTabBar::RoundedBelow || + ceData.tabBarData.shape == TQTabBar::TriangularBelow; if ( flags & Style_Selected ) { TQRect tabRect = r; //If not the right-most tab, readjust the painting to be one pixel wider //to avoid a doubled line - int rightMost = TQApplication::reverseLayout() ? 0 : tabBar->count() - 1; + int rightMost = TQApplication::reverseLayout() ? 0 : ceData.tabBarData.tabCount - 1; - if (tabBar->indexOf( opt.tab()->identifier() ) != rightMost) + if (ceData.tabBarData.identIndexMap[opt.tab()->identifier()] != rightMost) tabRect.setWidth( tabRect.width() + 1); - Keramik::ActiveTabPainter( bottom ).draw( p, tabRect, cg.button().light(110), cg.background(), !tabBar->isEnabled(), pmode()); + Keramik::ActiveTabPainter( bottom ).draw( p, tabRect, cg.button().light(110), cg.background(), !(elementFlags & CEF_IsEnabled), pmode()); } else { Keramik::InactiveTabPainter::Mode mode; - int index = tabBar->indexOf( opt.tab()->identifier() ); + int index = ceData.tabBarData.identIndexMap[opt.tab()->identifier()]; if ( index == 0 ) mode = Keramik::InactiveTabPainter::First; - else if ( index == tabBar->count() - 1 ) mode = Keramik::InactiveTabPainter::Last; + else if ( index == ceData.tabBarData.tabCount - 1 ) mode = Keramik::InactiveTabPainter::Last; else mode = Keramik::InactiveTabPainter::Middle; if ( bottom ) @@ -1610,7 +1604,6 @@ void KeramikStyle::drawControl( TQ_ControlElement element, // POPUPMENU ITEM // ------------------------------------------------------------------- case CE_PopupMenuItem: { - const TQPopupMenu *popupmenu = static_cast< const TQPopupMenu * >( widget ); TQRect main = r; TQMenuItem *mi = opt.menuItem(); @@ -1627,7 +1620,7 @@ void KeramikStyle::drawControl( TQ_ControlElement element, int tab = opt.tabWidth(); int checkcol = opt.maxIconWidth(); bool enabled = mi->isEnabled(); - bool checkable = popupmenu->isCheckable(); + bool checkable = (elementFlags & CEF_IsCheckable); bool active = flags & Style_Active; bool etchtext = styleHint( SH_EtchDisabledText, ceData, elementFlags ); bool reverse = TQApplication::reverseLayout(); @@ -2037,9 +2030,6 @@ void KeramikStyle::drawComplexControl( TQ_ComplexControl control, if (toolbarMode) toolbarBlendWidget = widget; - if ( widget == hoverWidget ) - flags |= Style_MouseOver; - drawPrimitive( PE_ButtonCommand, p2, ceData, elementFlags, br, cg, flags ); toolbarBlendWidget = 0; @@ -2259,10 +2249,6 @@ void KeramikStyle::drawComplexControl( TQ_ComplexControl control, if (active & SC_ToolButtonMenu) mflags |= Style_Down; - if ( widget == hoverWidget ) - bflags |= Style_MouseOver; - - if (onToolbar && static_cast<TQToolBar*>(TQT_TQWIDGET(widget->parent()))->orientation() == Qt::Horizontal) bflags |= Style_Horizontal; @@ -2420,11 +2406,10 @@ int KeramikStyle::pixelMetric(PixelMetric m, TQStyleControlElementData ceData, C case PM_TabBarTabShiftVertical: { - const TQTabBar* tb = ::tqqt_cast<const TQTabBar*>(widget); - if (tb) + if (ceData.widgetObjectTypes.contains(TQTABBAR_OBJECT_NAME_STRING)) { - if (tb->shape() == TQTabBar::RoundedBelow || - tb->shape() == TQTabBar::TriangularBelow) + if (ceData.tabBarData.shape == TQTabBar::RoundedBelow || + ceData.tabBarData.shape == TQTabBar::TriangularBelow) return 0; } @@ -2781,26 +2766,6 @@ bool KeramikStyle::objectEventHandler( TQStyleControlElementData ceData, Control if ( !object->isWidgetType() ) return false; - //Clear hover highlight when needed - if ( (event->type() == TQEvent::Leave) && (TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(hoverWidget)) ) - { - TQWidget* button = TQT_TQWIDGET(object); - hoverWidget = 0; - button->repaint( false ); - return false; - } - - //Hover highlight on buttons, toolbuttons and combos - if ( ::tqqt_cast<TQPushButton*>(object) || ::tqqt_cast<TQComboBox*>(object) || ::tqqt_cast<TQToolButton*>(object) ) - { - if (event->type() == TQEvent::Enter && TQT_TQWIDGET(object)->isEnabled() ) - { - hoverWidget = TQT_TQWIDGET(object); - hoverWidget->repaint( false ); - } - return false; - } - //Combo line edits get special frames if ( event->type() == TQEvent::Paint && ::tqqt_cast<TQLineEdit*>(object) ) { diff --git a/kstyles/keramik/keramik.h b/kstyles/keramik/keramik.h index dd5ad6b31..d40b21dda 100644 --- a/kstyles/keramik/keramik.h +++ b/kstyles/keramik/keramik.h @@ -204,9 +204,6 @@ private: return maskMode?Keramik::TilePainter::PaintMask : Keramik::TilePainter::PaintFullBlend; } - TQWidget* hoverWidget; - - bool kickerMode; // For progress bar animation |