diff options
| author | Katarina Behrens <Katarina.Behrens@cib.de> | 2018-04-24 13:43:14 +0200 |
|---|---|---|
| committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2018-06-01 10:06:27 +0200 |
| commit | 56d976cf50c3a092ec1923fc6088bf377a803693 (patch) | |
| tree | ea720985caaec0141d1e7af9f3f42acc5887b68a /vcl/unx/kde5/KDE5SalGraphics.cxx | |
| parent | 07807049d1f9a5847b72bb7f59f2355e8c9f764a (diff) | |
Render sliders and spinboxes natively
Change-Id: I307930eca8a82f3153f38362ee8f55cb121707b7
Diffstat (limited to 'vcl/unx/kde5/KDE5SalGraphics.cxx')
| -rw-r--r-- | vcl/unx/kde5/KDE5SalGraphics.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/vcl/unx/kde5/KDE5SalGraphics.cxx b/vcl/unx/kde5/KDE5SalGraphics.cxx index baaaa0fbdbb5..1a974bfbf089 100644 --- a/vcl/unx/kde5/KDE5SalGraphics.cxx +++ b/vcl/unx/kde5/KDE5SalGraphics.cxx @@ -113,11 +113,11 @@ bool KDE5SalGraphics::IsNativeControlSupported( ControlType type, ControlPart pa case ControlType::Listbox: return (part == ControlPart::Entire || part == ControlPart::HasBackgroundTexture); - /*case ControlType::Spinbox: + case ControlType::Spinbox: return (part == ControlPart::Entire || part == ControlPart::HasBackgroundTexture); case ControlType::Slider: - return (part == ControlPart::TrackHorzArea || part == ControlPart::TrackVertArea);*/ + return (part == ControlPart::TrackHorzArea || part == ControlPart::TrackVertArea); default: break; @@ -505,7 +505,7 @@ bool KDE5SalGraphics::drawNativeControl( ControlType type, ControlPart part, { returnVal = false; } - } + }*/ else if (type == ControlType::Spinbox) { QStyleOptionSpinBox option; @@ -531,7 +531,7 @@ bool KDE5SalGraphics::drawNativeControl( ControlType type, ControlPart part, draw( QStyle::CC_SpinBox, &option, m_image.get(), vclStateValue2StateFlag(nControlState, value) ); - }*/ + } else if (type == ControlType::Radiobutton) { QStyleOptionButton option; @@ -564,7 +564,7 @@ bool KDE5SalGraphics::drawNativeControl( ControlType type, ControlPart part, draw( QStyle::CE_MenuItem, &option, m_image.get(), vclStateValue2StateFlag(nControlState, value) ); - } + }*/ else if (type == ControlType::Slider && (part == ControlPart::TrackHorzArea || part == ControlPart::TrackVertArea)) { OSL_ASSERT( value.getType() == ControlType::Slider ); @@ -583,7 +583,7 @@ bool KDE5SalGraphics::drawNativeControl( ControlType type, ControlPart part, draw( QStyle::CC_Slider, &option, m_image.get(), vclStateValue2StateFlag(nControlState, value) ); } - else if( type == ControlType::Progress && part == ControlPart::Entire ) + /*else if( type == ControlType::Progress && part == ControlPart::Entire ) { QStyleOptionProgressBarV2 option; option.minimum = 0; @@ -729,7 +729,7 @@ bool KDE5SalGraphics::getNativeControlRegion( ControlType type, ControlPart part } break; } - /*case ControlType::Spinbox: + case ControlType::Spinbox: { QStyleOptionSpinBox sbo; sbo.frame = true; @@ -778,7 +778,7 @@ bool KDE5SalGraphics::getNativeControlRegion( ControlType type, ControlPart part } break; } - case ControlType::MenuPopup: + /*case ControlType::MenuPopup: { int h, w; switch ( part ) { @@ -833,7 +833,7 @@ bool KDE5SalGraphics::getNativeControlRegion( ControlType type, ControlPart part retVal = true; break; } - /* case ControlType::Slider: + case ControlType::Slider: { const int w = QApplication::style()->pixelMetric(QStyle::PM_SliderLength); if( part == ControlPart::ThumbHorz ) @@ -850,7 +850,7 @@ bool KDE5SalGraphics::getNativeControlRegion( ControlType type, ControlPart part } break; } - case ControlType::Toolbar: + /*case ControlType::Toolbar: { const int nWorH = QApplication::style()->pixelMetric(QStyle::PM_ToolBarHandleExtent); if( part == ControlPart::ThumbHorz ) |