summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKatarina Behrens <Katarina.Behrens@cib.de>2018-04-23 14:39:42 +0200
committerKatarina Behrens <Katarina.Behrens@cib.de>2018-06-01 10:06:26 +0200
commitfc6f2f4e11a168394169e10dcc80e81dff7cf42e (patch)
tree2e9d13b206d656adb92c14180ef38873589ee459
parentd8f9af32fbaab53261e7cc09bc587ffc7a5fc447 (diff)
Render pushbuttons natively
Change-Id: I1a8e82d70841765cad3d5838877489aab4656678
-rw-r--r--vcl/unx/kde5/KDE5SalGraphics.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/vcl/unx/kde5/KDE5SalGraphics.cxx b/vcl/unx/kde5/KDE5SalGraphics.cxx
index 1556eac7c694..e686565b46f2 100644
--- a/vcl/unx/kde5/KDE5SalGraphics.cxx
+++ b/vcl/unx/kde5/KDE5SalGraphics.cxx
@@ -90,7 +90,7 @@ bool KDE5SalGraphics::IsNativeControlSupported( ControlType type, ControlPart pa
{
switch (type)
{
- /*case ControlType::Pushbutton:*/
+ case ControlType::Pushbutton:
case ControlType::Radiobutton:
case ControlType::Checkbox:
/*case ControlType::Tooltip:
@@ -274,13 +274,13 @@ bool KDE5SalGraphics::drawNativeControl( ControlType type, ControlPart part,
QRegion* localClipRegion = nullptr;
- /*if (type == ControlType::Pushbutton)
+ if (type == ControlType::Pushbutton)
{
QStyleOptionButton option;
draw( QStyle::CE_PushButton, &option, m_image.get(),
vclStateValue2StateFlag(nControlState, value) );
}
- else if (type == ControlType::Menubar)
+ /*else if (type == ControlType::Menubar)
{
if (part == ControlPart::MenuItem)
{
@@ -473,7 +473,7 @@ bool KDE5SalGraphics::drawNativeControl( ControlType type, ControlPart part,
draw( QStyle::PE_IndicatorBranch, &option, m_image.get(),
vclStateValue2StateFlag(nControlState, value) );
}*/
- if (type == ControlType::Checkbox)
+ else if (type == ControlType::Checkbox)
{
QStyleOptionButton option;
draw( QStyle::CE_CheckBox, &option, m_image.get(),
@@ -638,7 +638,7 @@ bool KDE5SalGraphics::getNativeControlRegion( ControlType type, ControlPart part
switch ( type )
{
- /*// Metrics of the push button
+ // Metrics of the push button
case ControlType::Pushbutton:
if (part == ControlPart::Entire)
{
@@ -653,7 +653,7 @@ bool KDE5SalGraphics::getNativeControlRegion( ControlType type, ControlPart part
}
}
break;
- case ControlType::Editbox:
+ /*case ControlType::Editbox:
case ControlType::MultilineEditbox:
{
QStyleOptionFrameV3 fo;