vcl/unx/kde5/KDE5SalGraphics.cxx | 38 +++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-)
New commits:
commit 55cc229fbc2e1ae9c9cf80df15d9249abb81e2ba
Author: Katarina Behrens <katarina.behr...@cib.de>
Date: Tue Apr 24 16:45:55 2018 +0200
Render frames and window background natively
Change-Id: I947abe375fc74acbb8628076a0938d1074d1427c
diff --git a/vcl/unx/kde5/KDE5SalGraphics.cxx b/vcl/unx/kde5/KDE5SalGraphics.cxx
index bf58a1f6706f..4c5a70a89a77 100644
--- a/vcl/unx/kde5/KDE5SalGraphics.cxx
+++ b/vcl/unx/kde5/KDE5SalGraphics.cxx
@@ -94,9 +94,9 @@ bool KDE5SalGraphics::IsNativeControlSupported( ControlType
type, ControlPart pa
case ControlType::MultilineEditbox:
case ControlType::Combobox:
case ControlType::Toolbar:
- /*case ControlType::Frame:
- case ControlType::Scrollbar:
- case ControlType::WindowBackground:*/
+ case ControlType::Frame:
+ /*case ControlType::Scrollbar:*/
+ case ControlType::WindowBackground:
case ControlType::Fixedline:
return true;
@@ -533,7 +533,7 @@ bool KDE5SalGraphics::drawNativeControl( ControlType type,
ControlPart part,
QStyleOption option;
draw( QStyle::PE_PanelTipLabel, &option, m_image.get(),
vclStateValue2StateFlag(nControlState, value) );
- }
+ }*/
else if (type == ControlType::Frame)
{
lcl_drawFrame( QStyle::PE_Frame, m_image.get(),
@@ -545,7 +545,7 @@ bool KDE5SalGraphics::drawNativeControl( ControlType type,
ControlPart part,
else if (type == ControlType::WindowBackground)
{
// Nothing to do - see "Default image color" switch ^^
- }*/
+ }
else if (type == ControlType::Fixedline)
{
QStyleOptionMenuItem option;
@@ -791,7 +791,7 @@ bool KDE5SalGraphics::getNativeControlRegion( ControlType
type, ControlPart part
}
break;
}
- /*case ControlType::Frame:
+ case ControlType::Frame:
{
if( part == ControlPart::Border )
{
@@ -805,7 +805,7 @@ bool KDE5SalGraphics::getNativeControlRegion( ControlType
type, ControlPart part
retVal = true;
}
break;
- }*/
+ }
case ControlType::Radiobutton:
{
const int h =
QApplication::style()->pixelMetric(QStyle::PM_ExclusiveIndicatorHeight);
commit e71c16fbf551dfd2ec5c862d34aa4c2ff49c503a
Author: Katarina Behrens <katarina.behr...@cib.de>
Date: Tue Apr 24 16:38:01 2018 +0200
Render toolbars natively
Change-Id: Ib3716fa63dfccce66a6e43ba183820dc15497d07
diff --git a/vcl/unx/kde5/KDE5SalGraphics.cxx b/vcl/unx/kde5/KDE5SalGraphics.cxx
index 0ead29ea09fd..bf58a1f6706f 100644
--- a/vcl/unx/kde5/KDE5SalGraphics.cxx
+++ b/vcl/unx/kde5/KDE5SalGraphics.cxx
@@ -93,8 +93,8 @@ bool KDE5SalGraphics::IsNativeControlSupported( ControlType
type, ControlPart pa
case ControlType::Editbox:
case ControlType::MultilineEditbox:
case ControlType::Combobox:
- /*case ControlType::Toolbar:
- case ControlType::Frame:
+ case ControlType::Toolbar:
+ /*case ControlType::Frame:
case ControlType::Scrollbar:
case ControlType::WindowBackground:*/
case ControlType::Fixedline:
@@ -377,7 +377,7 @@ bool KDE5SalGraphics::drawNativeControl( ControlType type,
ControlPart part,
draw( QStyle::CE_ToolBar, &option, m_image.get(),
vclStateValue2StateFlag(nControlState, value) );
}
- /*else if ( (type == ControlType::Toolbar)
+ else if ( (type == ControlType::Toolbar)
&& (part == ControlPart::ThumbVert || part ==
ControlPart::ThumbHorz) )
{ // reduce paint area only to the handle area
const int handleExtend =
QApplication::style()->pixelMetric(QStyle::PM_ToolBarHandleExtent);
@@ -398,7 +398,7 @@ bool KDE5SalGraphics::drawNativeControl( ControlType type,
ControlPart part,
draw( QStyle::PE_IndicatorToolBarHandle, &option, m_image.get(),
vclStateValue2StateFlag(nControlState, value), rect );
- }*/
+ }
else if (type == ControlType::Editbox || type ==
ControlType::MultilineEditbox)
{
lcl_drawFrame( QStyle::PE_FrameLineEdit, m_image.get(),
@@ -840,7 +840,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 )
@@ -857,7 +857,7 @@ bool KDE5SalGraphics::getNativeControlRegion( ControlType
type, ControlPart part
}
break;
}
- case ControlType::Scrollbar:
+ /*case ControlType::Scrollbar:
{
// core can't handle 3-button scrollbars well, so we fix that in
hitTestNativeControl(),
// for the rest also provide the track area (i.e. area not taken
by buttons)
commit b9618cda9876b3603022c83199a19e5d49d6b33e
Author: Katarina Behrens <katarina.behr...@cib.de>
Date: Tue Apr 24 16:33:45 2018 +0200
Render list items natively
Change-Id: Id8560e3e89d09c44d6b7c7679f4b3f0d5b67a0ee
diff --git a/vcl/unx/kde5/KDE5SalGraphics.cxx b/vcl/unx/kde5/KDE5SalGraphics.cxx
index 5916869a6aa5..0ead29ea09fd 100644
--- a/vcl/unx/kde5/KDE5SalGraphics.cxx
+++ b/vcl/unx/kde5/KDE5SalGraphics.cxx
@@ -85,7 +85,7 @@ bool KDE5SalGraphics::IsNativeControlSupported( ControlType
type, ControlPart pa
case ControlType::Checkbox:
/*case ControlType::Tooltip:*/
case ControlType::Progress:
- /*case ControlType::ListNode:*/
+ case ControlType::ListNode:
return (part == ControlPart::Entire);
case ControlType::Menubar:
@@ -439,7 +439,7 @@ bool KDE5SalGraphics::drawNativeControl( ControlType type,
ControlPart part,
break;
}
}
- /*else if (type == ControlType::ListNode)
+ else if (type == ControlType::ListNode)
{
QStyleOption option;
option.state = QStyle::State_Item | QStyle::State_Children;
@@ -449,7 +449,7 @@ bool KDE5SalGraphics::drawNativeControl( ControlType type,
ControlPart part,
draw( QStyle::PE_IndicatorBranch, &option, m_image.get(),
vclStateValue2StateFlag(nControlState, value) );
- }*/
+ }
else if (type == ControlType::Checkbox)
{
QStyleOptionButton option;
commit a731c9c3e2f75e1295c9ad63b15a4a568dbcaaa8
Author: Katarina Behrens <katarina.behr...@cib.de>
Date: Tue Apr 24 15:54:38 2018 +0200
Render menu bar and popups natively
Change-Id: I32554c8d21d8c2454236fcfd367e876049fdfbeb
diff --git a/vcl/unx/kde5/KDE5SalGraphics.cxx b/vcl/unx/kde5/KDE5SalGraphics.cxx
index d3c7aa512db4..5916869a6aa5 100644
--- a/vcl/unx/kde5/KDE5SalGraphics.cxx
+++ b/vcl/unx/kde5/KDE5SalGraphics.cxx
@@ -88,16 +88,16 @@ bool KDE5SalGraphics::IsNativeControlSupported( ControlType
type, ControlPart pa
/*case ControlType::ListNode:*/
return (part == ControlPart::Entire);
- /*case ControlType::Menubar:
- case ControlType::MenuPopup:*/
+ case ControlType::Menubar:
+ case ControlType::MenuPopup:
case ControlType::Editbox:
case ControlType::MultilineEditbox:
case ControlType::Combobox:
/*case ControlType::Toolbar:
case ControlType::Frame:
case ControlType::Scrollbar:
- case ControlType::WindowBackground:
- case ControlType::Fixedline:*/
+ case ControlType::WindowBackground:*/
+ case ControlType::Fixedline:
return true;
case ControlType::Listbox:
@@ -257,7 +257,7 @@ bool KDE5SalGraphics::drawNativeControl( ControlType type,
ControlPart part,
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)
{
@@ -377,7 +377,7 @@ bool KDE5SalGraphics::drawNativeControl( ControlType type,
ControlPart part,
draw( QStyle::CE_ToolBar, &option, m_image.get(),
vclStateValue2StateFlag(nControlState, value) );
}
- else if ( (type == ControlType::Toolbar)
+ /*else if ( (type == ControlType::Toolbar)
&& (part == ControlPart::ThumbVert || part ==
ControlPart::ThumbHorz) )
{ // reduce paint area only to the handle area
const int handleExtend =
QApplication::style()->pixelMetric(QStyle::PM_ToolBarHandleExtent);
@@ -545,7 +545,7 @@ bool KDE5SalGraphics::drawNativeControl( ControlType type,
ControlPart part,
else if (type == ControlType::WindowBackground)
{
// Nothing to do - see "Default image color" switch ^^
- }
+ }*/
else if (type == ControlType::Fixedline)
{
QStyleOptionMenuItem option;
@@ -554,7 +554,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 );
@@ -768,7 +768,7 @@ bool KDE5SalGraphics::getNativeControlRegion( ControlType
type, ControlPart part
}
break;
}
- /*case ControlType::MenuPopup:
+ case ControlType::MenuPopup:
{
int h, w;
switch ( part ) {
@@ -791,7 +791,7 @@ bool KDE5SalGraphics::getNativeControlRegion( ControlType
type, ControlPart part
}
break;
}
- case ControlType::Frame:
+ /*case ControlType::Frame:
{
if( part == ControlPart::Border )
{
commit ba3391a684ee909b1a81abcc4526d404c481241b
Author: Katarina Behrens <katarina.behr...@cib.de>
Date: Tue Apr 24 15:24:41 2018 +0200
Render progress bar natively
Change-Id: I71148c242ba0933677f7582ec2e36fc4903e2f3e
diff --git a/vcl/unx/kde5/KDE5SalGraphics.cxx b/vcl/unx/kde5/KDE5SalGraphics.cxx
index c8682bfd62ee..d3c7aa512db4 100644
--- a/vcl/unx/kde5/KDE5SalGraphics.cxx
+++ b/vcl/unx/kde5/KDE5SalGraphics.cxx
@@ -83,9 +83,9 @@ bool KDE5SalGraphics::IsNativeControlSupported( ControlType
type, ControlPart pa
case ControlType::Pushbutton:
case ControlType::Radiobutton:
case ControlType::Checkbox:
- /*case ControlType::Tooltip:
+ /*case ControlType::Tooltip:*/
case ControlType::Progress:
- case ControlType::ListNode:*/
+ /*case ControlType::ListNode:*/
return (part == ControlPart::Entire);
/*case ControlType::Menubar:
@@ -573,7 +573,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;
@@ -584,7 +584,7 @@ bool KDE5SalGraphics::drawNativeControl( ControlType type,
ControlPart part,
draw( QStyle::CE_ProgressBar, &option, m_image.get(),
vclStateValue2StateFlag(nControlState, value) );
- }*/
+ }
else
{
returnVal = false;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
