[Libreoffice-commits] core.git: vcl/source vcl/uiconfig

2022-03-06 Thread Jim Raykowski (via logerrit) 
 vcl/source/window/event.cxx  |3 ++-
 vcl/uiconfig/ui/interimtearableparent.ui |1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 99ac14c8ccf89a51de1b3fb9d14789406f2dc95f
Author: Jim Raykowski 
AuthorDate: Mon Feb 7 19:34:51 2022 -0900
Commit: Jim Raykowski 
CommitDate: Mon Mar 7 02:46:38 2022 +0100

tdf#140222 make InterimTearableParent docking windows not dockable

and only allow dockable type docking windows to be undocked/docked

Change-Id: Ia1b0ccbdd911c24f83baf1c0514954e354c9070b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129650
Tested-by: Jenkins
Reviewed-by: Jim Raykowski 

diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx
index aca9fbb803da..4b94b70bc11c 100644
--- a/vcl/source/window/event.cxx
+++ b/vcl/source/window/event.cxx
@@ -111,7 +111,8 @@ bool Window::EventNotify( NotifyEvent& rNEvt )
 // check for docking window
 // but do nothing if window is docked and locked
 ImplDockingWindowWrapper *pWrapper = 
ImplGetDockingManager()->GetDockingWindowWrapper( this );
-if (pWrapper && ( pWrapper->IsFloatingMode() || !pWrapper->IsLocked() ))
+if ((GetStyle() & WB_DOCKABLE) &&
+pWrapper && ( pWrapper->IsFloatingMode() || !pWrapper->IsLocked() 
))
 {
 const bool bDockingSupportCrippled = 
!StyleSettings::GetDockingFloatsSupported();
 
diff --git a/vcl/uiconfig/ui/interimtearableparent.ui 
b/vcl/uiconfig/ui/interimtearableparent.ui
index ad8e952b3582..4ab25d2e9b3e 100644
--- a/vcl/uiconfig/ui/interimtearableparent.ui
+++ b/vcl/uiconfig/ui/interimtearableparent.ui
@@ -9,7 +9,6 @@
 4
 False
 True
-dock
 
   
 True

[Libreoffice-commits] core.git: vcl/source vcl/uiconfig

2019-06-06 Thread Tomaž Vajngerl (via logerrit) 
 vcl/source/control/button.cxx |5 +++--
 vcl/uiconfig/theme_definitions/ios/definition.xml |2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 302a00a3190743f5e6d2b61e5b40e493c4744b7e
Author: Tomaž Vajngerl 
AuthorDate: Thu Jun 6 17:14:53 2019 +0900
Commit: Tomaž Vajngerl 
CommitDate: Thu Jun 6 15:48:19 2019 +0200

tdf#124947 fix hit area of the radio buttons, size in ios theme

The hit area of the radio buttons was not calculated correctly, so
sometimes when you hit the radio button at the "wrong" place,
nothing happened. This fixes the hit area to correctly cover the
radio button and the text.

Another issue was that the ios theme size of the radio button was
not defined correctly (32px instead of 26px), which increased the
error when calculating the hit are even more. The height of the
radio button should be the same as defined in the definition.xml,
and not bigger (or smaller).

Change-Id: I4b03f36ca9d9c82bd6dc442bd6e06af938c62bdd
Reviewed-on: https://gerrit.libreoffice.org/73592
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 5ab14d2c2db2..864214b66e43 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -2054,8 +2054,9 @@ void RadioButton::ImplDraw( OutputDevice* pDev, DrawFlags 
nDrawFlags,
 
 ImplDrawAlignedImage( pDev, aPos, aSize, 1, nTextStyle );
 
-rMouseRect  = tools::Rectangle( aPos, aSize );
-rMouseRect.SetLeft( rPos.X() );
+rMouseRect = tools::Rectangle(aPos, aSize);
+rMouseRect.SetLeft(rPos.X());
+rMouseRect.SetTop(rPos.Y());
 
 rStateRect.SetLeft( rPos.X() );
 rStateRect.SetTop( rMouseRect.Top() );
diff --git a/vcl/uiconfig/theme_definitions/ios/definition.xml 
b/vcl/uiconfig/theme_definitions/ios/definition.xml
index 61d6aa21578e..b0e26f01079c 100644
--- a/vcl/uiconfig/theme_definitions/ios/definition.xml
+++ b/vcl/uiconfig/theme_definitions/ios/definition.xml
@@ -85,7 +85,7 @@
 
 
 
-
+

 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-commits] core.git: vcl/source vcl/uiconfig

2019-03-26 Thread Tomaž Vajngerl 

Hi Thorsten,

On 26/03/2019 10:00, Thorsten Behrens wrote:

Hi Tomaž,

Interesting work there! Very curious (also wrt. the gesture support
from more recent commits) about the general direction - would it be
possible to add a few lines to vcl/README for the new directories'
purpose?


Yes, a good idea. I'll update vcl/README when I find some free time to 
do it.



Cheers,

-- Thorsten

Tomaž
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice-commits] core.git: vcl/source vcl/uiconfig

2019-03-26 Thread Thorsten Behrens 
Hi Tomaž,

Libreoffice Gerrit user wrote:
>  vcl/uiconfig/theme_definitions/definition.xml |8 
>
Interesting work there! Very curious (also wrt. the gesture support
from more recent commits) about the general direction - would it be
possible to add a few lines to vcl/README for the new directories'
purpose?

Cheers,

-- Thorsten


signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: vcl/source vcl/uiconfig

2019-03-11 Thread Libreoffice Gerrit user 
 vcl/source/gdi/FileDefinitionWidgetDraw.cxx   |3 +--
 vcl/uiconfig/theme_definitions/definition.xml |6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 2513e6864fee07da9ec8ea5489ada82de0991b15
Author: Tomaž Vajngerl 
AuthorDate: Sun Mar 10 22:27:54 2019 +0100
Commit: Tomaž Vajngerl 
CommitDate: Mon Mar 11 08:12:18 2019 +0100

widget theme: slight window borders, use font 10 instead of 12

Change-Id: I6b0ba769817894b99c3f757d23948783a66fce12
Reviewed-on: https://gerrit.libreoffice.org/69023
Reviewed-by: Tomaž Vajngerl 
Tested-by: Tomaž Vajngerl 

diff --git a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx 
b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
index 59f0947e7eea..e321734e9a6e 100644
--- a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
+++ b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
@@ -830,7 +830,6 @@ bool FileDefinitionWidgetDraw::getNativeControlRegion(
 return true;
 }
 break;
-
 default:
 break;
 }
@@ -895,7 +894,7 @@ bool FileDefinitionWidgetDraw::updateSettings(AllSettings& 
rSettings)
 aStyleSet.SetToolTextColor(pDefinitionStyle->maToolTextColor);
 aStyleSet.SetFontColor(pDefinitionStyle->maFontColor);
 
-vcl::Font aFont(FAMILY_SWISS, Size(0, 12));
+vcl::Font aFont(FAMILY_SWISS, Size(0, 10));
 aFont.SetCharSet(osl_getThreadTextEncoding());
 aFont.SetWeight(WEIGHT_NORMAL);
 aFont.SetFamilyName("Liberation Sans");
diff --git a/vcl/uiconfig/theme_definitions/definition.xml 
b/vcl/uiconfig/theme_definitions/definition.xml
index a4394de98ec5..e91953109554 100644
--- a/vcl/uiconfig/theme_definitions/definition.xml
+++ b/vcl/uiconfig/theme_definitions/definition.xml
@@ -361,7 +361,7 @@
 
 
 
-
+
 
 
 
@@ -369,12 +369,12 @@
 
 
 
-
+
 
 
 
 
-
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/source vcl/uiconfig

2019-03-10 Thread Libreoffice Gerrit user 
 vcl/source/gdi/FileDefinitionWidgetDraw.cxx   |   17 ++---
 vcl/source/gdi/WidgetDefinitionReader.cxx |   48 ++
 vcl/uiconfig/theme_definitions/definition.xml |8 
 3 files changed, 46 insertions(+), 27 deletions(-)

New commits:
commit 7e5fe834e722d51b5e82ecddfe549ec21c7a225e
Author: Tomaž Vajngerl 
AuthorDate: Sun Mar 10 21:54:04 2019 +0100
Commit: Tomaž Vajngerl 
CommitDate: Mon Mar 11 00:14:45 2019 +0100

widget theme: add support for menubar, menupopup and tooltip

But they are not used - for now.

Change-Id: I93a74f5a9e52791fd08afbb5502427a0684d60cf
Reviewed-on: https://gerrit.libreoffice.org/69021
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx 
b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
index 5c0920bca4d6..59f0947e7eea 100644
--- a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
+++ b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
@@ -121,12 +121,13 @@ bool 
FileDefinitionWidgetDraw::isNativeControlSupported(ControlType eType, Contr
 return true;
 case ControlType::Menubar:
 case ControlType::MenuPopup:
-return false;
+return true;
 case ControlType::Progress:
 return true;
 case ControlType::IntroProgress:
-case ControlType::Tooltip:
 return false;
+case ControlType::Tooltip:
+return true;
 case ControlType::WindowBackground:
 case ControlType::Frame:
 case ControlType::ListNode:
@@ -581,17 +582,23 @@ bool 
FileDefinitionWidgetDraw::drawNativeControl(ControlType eType, ControlPart
 }
 break;
 case ControlType::Menubar:
-break;
 case ControlType::MenuPopup:
-break;
+{
+bOK = resolveDefinition(eType, ePart, eState, rValue, nX, nY, 
nWidth, nHeight);
+}
+break;
 case ControlType::Progress:
 {
 bOK = resolveDefinition(eType, ePart, eState, rValue, nX, nY, 
nWidth, nHeight);
 }
 break;
 case ControlType::IntroProgress:
-case ControlType::Tooltip:
 break;
+case ControlType::Tooltip:
+{
+bOK = resolveDefinition(eType, ePart, eState, rValue, nX, nY, 
nWidth, nHeight);
+}
+break;
 case ControlType::WindowBackground:
 case ControlType::Frame:
 {
diff --git a/vcl/source/gdi/WidgetDefinitionReader.cxx 
b/vcl/source/gdi/WidgetDefinitionReader.cxx
index f52757d37629..c183cb717e9c 100644
--- a/vcl/source/gdi/WidgetDefinitionReader.cxx
+++ b/vcl/source/gdi/WidgetDefinitionReader.cxx
@@ -139,28 +139,32 @@ ControlPart xmlStringToControlPart(OString const& sPart)
 
 bool getControlTypeForXmlString(OString const& rString, ControlType& reType)
 {
-static std::unordered_map aPartMap
-= { { "pushbutton", ControlType::Pushbutton },
-{ "radiobutton", ControlType::Radiobutton },
-{ "checkbox", ControlType::Checkbox },
-{ "combobox", ControlType::Combobox },
-{ "editbox", ControlType::Editbox },
-{ "listbox", ControlType::Listbox },
-{ "scrollbar", ControlType::Scrollbar },
-{ "spinbox", ControlType::Spinbox },
-{ "slider", ControlType::Slider },
-{ "fixedline", ControlType::Fixedline },
-{ "progress", ControlType::Progress },
-{ "tabitem", ControlType::TabItem },
-{ "tabheader", ControlType::TabHeader },
-{ "tabpane", ControlType::TabPane },
-{ "tabbody", ControlType::TabBody },
-{ "frame", ControlType::Frame },
-{ "windowbackground", ControlType::WindowBackground },
-{ "toolbar", ControlType::Toolbar },
-{ "listnode", ControlType::ListNode },
-{ "listnet", ControlType::ListNet },
-{ "listheader", ControlType::ListHeader } };
+static std::unordered_map aPartMap = {
+{ "pushbutton", ControlType::Pushbutton },
+{ "radiobutton", ControlType::Radiobutton },
+{ "checkbox", ControlType::Checkbox },
+{ "combobox", ControlType::Combobox },
+{ "editbox", ControlType::Editbox },
+{ "listbox", ControlType::Listbox },
+{ "scrollbar", ControlType::Scrollbar },
+{ "spinbox", ControlType::Spinbox },
+{ "slider", ControlType::Slider },
+{ "fixedline", ControlType::Fixedline },
+{ "progress", ControlType::Progress },
+{ "tabitem", ControlType::TabItem },
+{ "tabheader", ControlType::TabHeader },
+{ "tabpane", ControlType::TabPane },
+{ "tabbody", ControlType::TabBody },
+{ "frame", ControlType::Frame },
+{ "windowbackground", ControlType::WindowBackground },
+{ "toolbar", ControlType::Toolbar },
+{ "listnode", ControlType::ListNode },
+

[Libreoffice-commits] core.git: vcl/source vcl/uiconfig

2019-03-10 Thread Libreoffice Gerrit user 
 vcl/source/gdi/FileDefinitionWidgetDraw.cxx   |9 ++---
 vcl/uiconfig/theme_definitions/definition.xml |2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 3ae8b9301fa817968f3115639bc8a5f2170d179e
Author: Tomaž Vajngerl 
AuthorDate: Sun Mar 10 17:26:29 2019 +0100
Commit: Tomaž Vajngerl 
CommitDate: Sun Mar 10 21:55:39 2019 +0100

widget theme: support "height" for editbox and set to "32"

Change-Id: Iff48c83b6f1b28bc7fbf7646c399a844a3155970
Reviewed-on: https://gerrit.libreoffice.org/69012
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx 
b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
index 4fb2fd315f8d..9085753dbf25 100644
--- a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
+++ b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
@@ -728,10 +728,13 @@ bool FileDefinitionWidgetDraw::getNativeControlRegion(
 case ControlType::EditboxNoBorder:
 case ControlType::MultilineEditbox:
 {
-//auto const& pPart = m_aWidgetDefinition.getDefinition(eType, 
ControlPart::Entire);
+sal_Int32 nHeight = rBoundingControlRegion.GetHeight();
 
-Size aSize(rBoundingControlRegion.GetWidth(),
-   std::max(rBoundingControlRegion.GetHeight(), 32L));
+auto const& pPart = m_pWidgetDefinition->getDefinition(eType, 
ControlPart::Entire);
+if (pPart)
+nHeight = std::max(nHeight, pPart->mnHeight);
+
+Size aSize(rBoundingControlRegion.GetWidth(), nHeight);
 rNativeContentRegion = tools::Rectangle(aLocation, aSize);
 rNativeBoundingRegion = rNativeContentRegion;
 rNativeBoundingRegion.expand(2);
diff --git a/vcl/uiconfig/theme_definitions/definition.xml 
b/vcl/uiconfig/theme_definitions/definition.xml
index 027b78e5fd6e..848f0e600d89 100644
--- a/vcl/uiconfig/theme_definitions/definition.xml
+++ b/vcl/uiconfig/theme_definitions/definition.xml
@@ -147,7 +147,7 @@
 
 
 
-
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/source vcl/uiconfig

2019-03-07 Thread Libreoffice Gerrit user 
 vcl/source/gdi/FileDefinitionWidgetDraw.cxx   |8 ++--
 vcl/uiconfig/theme_definitions/definition.xml |8 +---
 2 files changed, 11 insertions(+), 5 deletions(-)

New commits:
commit 27b43f1dc45d7f3bec99ccbdc96e334c7f967fbc
Author: Tomaž Vajngerl 
AuthorDate: Thu Mar 7 14:16:34 2019 +0100
Commit: Tomaž Vajngerl 
CommitDate: Thu Mar 7 21:22:44 2019 +0100

widget theme - update editbox, draw from svg

Change-Id: I0dfdaaf74c9b31ecd9b1de511b48dacf2e90f59f
Reviewed-on: https://gerrit.libreoffice.org/68866
Reviewed-by: Tomaž Vajngerl 
Tested-by: Tomaž Vajngerl 

diff --git a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx 
b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
index 54aa111431d9..606417ac1ca5 100644
--- a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
+++ b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
@@ -701,8 +701,12 @@ bool FileDefinitionWidgetDraw::getNativeControlRegion(
 case ControlType::EditboxNoBorder:
 case ControlType::MultilineEditbox:
 {
-rNativeBoundingRegion = rBoundingControlRegion;
-rNativeContentRegion = rBoundingControlRegion;
+//auto const& pPart = m_aWidgetDefinition.getDefinition(eType, 
ControlPart::Entire);
+
+Size aSize(rBoundingControlRegion.GetWidth(),
+   std::max(rBoundingControlRegion.GetHeight(), 32L));
+rNativeContentRegion = tools::Rectangle(aLocation, aSize);
+rNativeBoundingRegion = rNativeContentRegion;
 return true;
 }
 break;
diff --git a/vcl/uiconfig/theme_definitions/definition.xml 
b/vcl/uiconfig/theme_definitions/definition.xml
index 8c9b1af285d9..0a6f696320b5 100644
--- a/vcl/uiconfig/theme_definitions/definition.xml
+++ b/vcl/uiconfig/theme_definitions/definition.xml
@@ -148,9 +148,11 @@
 
 
 
-
-
-
+
+
+
+
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/source vcl/uiconfig

2019-03-06 Thread Libreoffice Gerrit user 
 vcl/source/gdi/FileDefinitionWidgetDraw.cxx   |6 +-
 vcl/source/gdi/WidgetDefinitionReader.cxx |5 -
 vcl/uiconfig/theme_definitions/definition.xml |9 +
 3 files changed, 18 insertions(+), 2 deletions(-)

New commits:
commit c34f8f2233212bba7ecca4d128b2ab59b2d1dd6a
Author: Tomaž Vajngerl 
AuthorDate: Sat Mar 2 23:40:22 2019 +0100
Commit: Tomaž Vajngerl 
CommitDate: Wed Mar 6 16:35:53 2019 +0100

Draw basic list{node,net,header} from the theme definition

Change-Id: I05b2cced0f99d6628a12465748820e3a87c5f3e7
Reviewed-on: https://gerrit.libreoffice.org/68774
Reviewed-by: Tomaž Vajngerl 
Tested-by: Tomaž Vajngerl 

diff --git a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx 
b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
index 9b903a20cd93..15c10a16e1b9 100644
--- a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
+++ b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
@@ -106,7 +106,7 @@ bool 
FileDefinitionWidgetDraw::isNativeControlSupported(ControlType eType, Contr
 case ControlType::ListNode:
 case ControlType::ListNet:
 case ControlType::ListHeader:
-return false;
+return true;
 }
 
 return false;
@@ -404,6 +404,10 @@ bool 
FileDefinitionWidgetDraw::drawNativeControl(ControlType eType, ControlPart
 case ControlType::ListNode:
 case ControlType::ListNet:
 case ControlType::ListHeader:
+{
+bOK = resolveDefinition(eType, ePart, eState, rValue, nX, nY, 
nWidth, nHeight);
+}
+break;
 default:
 break;
 }
diff --git a/vcl/source/gdi/WidgetDefinitionReader.cxx 
b/vcl/source/gdi/WidgetDefinitionReader.cxx
index be0831a4f3c7..12161f00b7cd 100644
--- a/vcl/source/gdi/WidgetDefinitionReader.cxx
+++ b/vcl/source/gdi/WidgetDefinitionReader.cxx
@@ -150,7 +150,10 @@ bool getControlTypeForXmlString(OString const& rString, 
ControlType& reType)
 { "tabbody", ControlType::TabBody },
 { "frame", ControlType::Frame },
 { "windowbackground", ControlType::WindowBackground },
-{ "toolbar", ControlType::Toolbar } };
+{ "toolbar", ControlType::Toolbar },
+{ "listnode", ControlType::ListNode },
+{ "listnet", ControlType::ListNet },
+{ "listheader", ControlType::ListHeader } };
 
 auto const& rIterator = aPartMap.find(rString);
 if (rIterator != aPartMap.end())
diff --git a/vcl/uiconfig/theme_definitions/definition.xml 
b/vcl/uiconfig/theme_definitions/definition.xml
index bd0a899d5ec4..ddfe9cdff99d 100644
--- a/vcl/uiconfig/theme_definitions/definition.xml
+++ b/vcl/uiconfig/theme_definitions/definition.xml
@@ -380,4 +380,13 @@
 
 
 
+
+
+
+
+
+
+
+
+
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/source vcl/uiconfig

2019-03-05 Thread Libreoffice Gerrit user 
 vcl/source/gdi/FileDefinitionWidgetDraw.cxx   |   21 -
 vcl/source/gdi/WidgetDefinitionReader.cxx |2 +-
 vcl/uiconfig/theme_definitions/definition.xml |8 
 3 files changed, 29 insertions(+), 2 deletions(-)

New commits:
commit 5c124597d0446bbb7cb0672a6335ebcd68520e00
Author: Tomaž Vajngerl 
AuthorDate: Tue Feb 19 14:21:42 2019 +0100
Commit: Tomaž Vajngerl 
CommitDate: Tue Mar 5 20:24:32 2019 +0100

Draw basic progress from the theme definition

Change-Id: If2c6f434dd64cf1b3bab340dc6c4d73f439bcfdf
Reviewed-on: https://gerrit.libreoffice.org/68751
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx 
b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
index 14477ef40ec5..7fa086bbd854 100644
--- a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
+++ b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
@@ -87,8 +87,10 @@ bool 
FileDefinitionWidgetDraw::isNativeControlSupported(ControlType eType, Contr
 case ControlType::Toolbar:
 case ControlType::Menubar:
 case ControlType::MenuPopup:
+return false;
 case ControlType::Progress:
 case ControlType::IntroProgress:
+return true;
 case ControlType::Tooltip:
 case ControlType::WindowBackground:
 case ControlType::Frame:
@@ -478,7 +480,24 @@ bool 
FileDefinitionWidgetDraw::drawNativeControl(ControlType eType, ControlPart
 break;
 case ControlType::Progress:
 case ControlType::IntroProgress:
-break;
+{
+std::shared_ptr pPart
+= m_aWidgetDefinition.getDefinition(eType, ePart);
+if (pPart)
+{
+auto aStates = pPart->getStates(eState, rValue);
+if (!aStates.empty())
+{
+std::shared_ptr pState = 
aStates.back();
+{
+munchDrawCommands(pState->mpDrawCommands, m_rGraphics, 
nX, nY, nWidth,
+  nHeight);
+bOK = true;
+}
+}
+}
+}
+break;
 case ControlType::Tooltip:
 break;
 case ControlType::WindowBackground:
diff --git a/vcl/source/gdi/WidgetDefinitionReader.cxx 
b/vcl/source/gdi/WidgetDefinitionReader.cxx
index 8be78889e990..3d210b1d88cd 100644
--- a/vcl/source/gdi/WidgetDefinitionReader.cxx
+++ b/vcl/source/gdi/WidgetDefinitionReader.cxx
@@ -137,7 +137,7 @@ bool getControlTypeForXmlString(OString const& rString, 
ControlType& reType)
 { "checkbox", ControlType::Checkbox }, { "combobox", 
ControlType::Combobox },
 { "editbox", ControlType::Editbox },   { "scrollbar", 
ControlType::Scrollbar },
 { "spinbox", ControlType::Spinbox },   { "slider", 
ControlType::Slider },
-{ "fixedline", ControlType::Fixedline } };
+{ "fixedline", ControlType::Fixedline },   { "progress", 
ControlType::Progress } };
 
 auto const& rIterator = aPartMap.find(rString);
 if (rIterator != aPartMap.end())
diff --git a/vcl/uiconfig/theme_definitions/definition.xml 
b/vcl/uiconfig/theme_definitions/definition.xml
index 8adfc76ae6b1..8aa959ab314e 100644
--- a/vcl/uiconfig/theme_definitions/definition.xml
+++ b/vcl/uiconfig/theme_definitions/definition.xml
@@ -214,4 +214,12 @@
 
 
 
+
+
+
+
+
+
+
+
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/source vcl/uiconfig

2019-03-05 Thread Libreoffice Gerrit user 
 vcl/source/gdi/FileDefinitionWidgetDraw.cxx   |   21 ++-
 vcl/source/gdi/WidgetDefinitionReader.cxx |4 ++
 vcl/uiconfig/theme_definitions/definition.xml |   35 ++
 3 files changed, 58 insertions(+), 2 deletions(-)

New commits:
commit 67b6b526dd759d28c554880b2e728ca99c6cce7b
Author: Tomaž Vajngerl 
AuthorDate: Tue Feb 19 14:26:40 2019 +0100
Commit: Tomaž Vajngerl 
CommitDate: Tue Mar 5 20:24:51 2019 +0100

Draw basic tabbar widgets from the theme definition

Change-Id: I51f8868abff3f3e38bd70ea1fc99a9cf5aca92a6
Reviewed-on: https://gerrit.libreoffice.org/68752
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx 
b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
index 7fa086bbd854..f2db60e4b5f0 100644
--- a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
+++ b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
@@ -45,6 +45,10 @@ 
FileDefinitionWidgetDraw::FileDefinitionWidgetDraw(SalGraphics& rGraphics)
 ImplSVData* pSVData = ImplGetSVData();
 pSVData->maNWFData.mbNoFocusRects = true;
 pSVData->maNWFData.mbNoFocusRectsForFlatButtons = true;
+pSVData->maNWFData.mbNoActiveTabTextRaise = true;
+pSVData->maNWFData.mbCenteredTabs = true;
+pSVData->maNWFData.mbProgressNeedsErase = true;
+pSVData->maNWFData.mnStatusBarLowerRightOffset = 10;
 }
 
 bool FileDefinitionWidgetDraw::isNativeControlSupported(ControlType eType, 
ControlPart ePart)
@@ -71,11 +75,12 @@ bool 
FileDefinitionWidgetDraw::isNativeControlSupported(ControlType eType, Contr
 return false;
 return true;
 case ControlType::SpinButtons:
+return false;
 case ControlType::TabItem:
 case ControlType::TabPane:
 case ControlType::TabHeader:
 case ControlType::TabBody:
-return false;
+return true;
 case ControlType::Scrollbar:
 if (ePart == ControlPart::DrawBackgroundHorz
 || ePart == ControlPart::DrawBackgroundVert)
@@ -402,9 +407,15 @@ bool 
FileDefinitionWidgetDraw::drawNativeControl(ControlType eType, ControlPart
 }
 break;
 case ControlType::SpinButtons:
+break;
 case ControlType::TabItem:
+case ControlType::TabHeader:
 case ControlType::TabPane:
 case ControlType::TabBody:
+{
+bOK = resolveDefinition(eType, ePart, eState, rValue, nX, nY, 
nWidth, nHeight);
+}
+break;
 case ControlType::Scrollbar:
 {
 bOK = resolveDefinition(eType, ePart, eState, rValue, nX, nY, 
nWidth, nHeight);
@@ -568,6 +579,14 @@ bool FileDefinitionWidgetDraw::getNativeControlRegion(
 case ControlType::Radiobutton:
 rNativeContentRegion = tools::Rectangle(Point(), Size(32, 32));
 return true;
+case ControlType::TabItem:
+{
+rNativeBoundingRegion = 
tools::Rectangle(rBoundingControlRegion.TopLeft(),
+ 
Size(rBoundingControlRegion.GetWidth() + 20,
+  
rBoundingControlRegion.GetHeight() + 6));
+rNativeContentRegion = rNativeBoundingRegion;
+return true;
+}
 default:
 break;
 }
diff --git a/vcl/source/gdi/WidgetDefinitionReader.cxx 
b/vcl/source/gdi/WidgetDefinitionReader.cxx
index 3d210b1d88cd..351d0fcdc9ef 100644
--- a/vcl/source/gdi/WidgetDefinitionReader.cxx
+++ b/vcl/source/gdi/WidgetDefinitionReader.cxx
@@ -137,7 +137,9 @@ bool getControlTypeForXmlString(OString const& rString, 
ControlType& reType)
 { "checkbox", ControlType::Checkbox }, { "combobox", 
ControlType::Combobox },
 { "editbox", ControlType::Editbox },   { "scrollbar", 
ControlType::Scrollbar },
 { "spinbox", ControlType::Spinbox },   { "slider", 
ControlType::Slider },
-{ "fixedline", ControlType::Fixedline },   { "progress", 
ControlType::Progress } };
+{ "fixedline", ControlType::Fixedline },   { "progress", 
ControlType::Progress },
+{ "tabitem", ControlType::TabItem },   { "tabheader", 
ControlType::TabHeader },
+{ "tabpane", ControlType::TabPane },   { "tabbody", 
ControlType::TabBody } };
 
 auto const& rIterator = aPartMap.find(rString);
 if (rIterator != aPartMap.end())
diff --git a/vcl/uiconfig/theme_definitions/definition.xml 
b/vcl/uiconfig/theme_definitions/definition.xml
index 8aa959ab314e..13859cfa3833 100644
--- a/vcl/uiconfig/theme_definitions/definition.xml
+++ b/vcl/uiconfig/theme_definitions/definition.xml
@@ -222,4 +222,39 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

[Libreoffice-commits] core.git: vcl/source vcl/uiconfig

2019-03-05 Thread Libreoffice Gerrit user 
 vcl/source/gdi/FileDefinitionWidgetDraw.cxx   |   20 +++-
 vcl/source/gdi/WidgetDefinitionReader.cxx |3 ++-
 vcl/uiconfig/theme_definitions/definition.xml |   13 +
 3 files changed, 34 insertions(+), 2 deletions(-)

New commits:
commit 16d9cfe92a60e3a7ea238ef4a656e5277231b866
Author: Tomaž Vajngerl 
AuthorDate: Tue Feb 19 14:17:54 2019 +0100
Commit: Tomaž Vajngerl 
CommitDate: Tue Mar 5 20:24:14 2019 +0100

Draw basic fixedline from the theme definition

Change-Id: I791d33e4cea14f49609434e39f681cf47864fc67
Reviewed-on: https://gerrit.libreoffice.org/68750
Reviewed-by: Tomaž Vajngerl 
Tested-by: Tomaž Vajngerl 

diff --git a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx 
b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
index 317cb3455641..14477ef40ec5 100644
--- a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
+++ b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
@@ -82,8 +82,8 @@ bool 
FileDefinitionWidgetDraw::isNativeControlSupported(ControlType eType, Contr
 return false;
 return true;
 case ControlType::Slider:
-return true;
 case ControlType::Fixedline:
+return true;
 case ControlType::Toolbar:
 case ControlType::Menubar:
 case ControlType::MenuPopup:
@@ -453,6 +453,24 @@ bool 
FileDefinitionWidgetDraw::drawNativeControl(ControlType eType, ControlPart
 }
 break;
 case ControlType::Fixedline:
+{
+std::shared_ptr pPart
+= m_aWidgetDefinition.getDefinition(eType, ePart);
+if (pPart)
+{
+auto aStates = pPart->getStates(eState, rValue);
+if (!aStates.empty())
+{
+std::shared_ptr pState = 
aStates.back();
+{
+munchDrawCommands(pState->mpDrawCommands, m_rGraphics, 
nX, nY, nWidth,
+  nHeight);
+bOK = true;
+}
+}
+}
+}
+break;
 case ControlType::Toolbar:
 case ControlType::Menubar:
 break;
diff --git a/vcl/source/gdi/WidgetDefinitionReader.cxx 
b/vcl/source/gdi/WidgetDefinitionReader.cxx
index 9e4ed46f6f36..8be78889e990 100644
--- a/vcl/source/gdi/WidgetDefinitionReader.cxx
+++ b/vcl/source/gdi/WidgetDefinitionReader.cxx
@@ -136,7 +136,8 @@ bool getControlTypeForXmlString(OString const& rString, 
ControlType& reType)
 = { { "pushbutton", ControlType::Pushbutton }, { "radiobutton", 
ControlType::Radiobutton },
 { "checkbox", ControlType::Checkbox }, { "combobox", 
ControlType::Combobox },
 { "editbox", ControlType::Editbox },   { "scrollbar", 
ControlType::Scrollbar },
-{ "spinbox", ControlType::Spinbox },   { "slider", 
ControlType::Slider } };
+{ "spinbox", ControlType::Spinbox },   { "slider", 
ControlType::Slider },
+{ "fixedline", ControlType::Fixedline } };
 
 auto const& rIterator = aPartMap.find(rString);
 if (rIterator != aPartMap.end())
diff --git a/vcl/uiconfig/theme_definitions/definition.xml 
b/vcl/uiconfig/theme_definitions/definition.xml
index e57404c94013..8adfc76ae6b1 100644
--- a/vcl/uiconfig/theme_definitions/definition.xml
+++ b/vcl/uiconfig/theme_definitions/definition.xml
@@ -201,4 +201,17 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/source vcl/uiconfig

2019-03-05 Thread Libreoffice Gerrit user 
 vcl/source/gdi/FileDefinitionWidgetDraw.cxx   |   46 ++
 vcl/source/gdi/WidgetDefinitionReader.cxx |   11 ++
 vcl/uiconfig/theme_definitions/definition.xml |   18 ++
 3 files changed, 69 insertions(+), 6 deletions(-)

New commits:
commit 5a226c977633dc77a0a92b5196c75f3863bf1a3d
Author: Tomaž Vajngerl 
AuthorDate: Tue Feb 19 14:05:02 2019 +0100
Commit: Tomaž Vajngerl 
CommitDate: Tue Mar 5 14:50:35 2019 +0100

Draw basic slider from the theme definition

Change-Id: I5ccd6c2e743324cee2a030e55425df4791e12e2f
Reviewed-on: https://gerrit.libreoffice.org/68719
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx 
b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
index 1e7c8928f0f1..bb6756bf1b9c 100644
--- a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
+++ b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
@@ -76,7 +76,9 @@ bool 
FileDefinitionWidgetDraw::isNativeControlSupported(ControlType eType, Contr
 case ControlType::TabHeader:
 case ControlType::TabBody:
 case ControlType::Scrollbar:
+return false;
 case ControlType::Slider:
+return true;
 case ControlType::Fixedline:
 case ControlType::Toolbar:
 case ControlType::Menubar:
@@ -375,7 +377,51 @@ bool 
FileDefinitionWidgetDraw::drawNativeControl(ControlType eType, ControlPart
 case ControlType::TabPane:
 case ControlType::TabBody:
 case ControlType::Scrollbar:
+break;
 case ControlType::Slider:
+{
+{
+std::shared_ptr pPart
+= m_aWidgetDefinition.getDefinition(eType, ePart);
+if (pPart)
+{
+auto aStates = pPart->getStates(eState, rValue);
+if (!aStates.empty())
+{
+std::shared_ptr pState = 
aStates.back();
+{
+munchDrawCommands(pState->mpDrawCommands, 
m_rGraphics, nX, nY, nWidth,
+  nHeight);
+bOK = true;
+}
+}
+}
+}
+if (bOK)
+{
+const SliderValue* pSliderValue = static_cast();
+
+std::shared_ptr pPart
+= m_aWidgetDefinition.getDefinition(eType, 
ControlPart::Button);
+if (pPart)
+{
+auto aStates = pPart->getStates(eState | 
pSliderValue->mnThumbState, rValue);
+if (!aStates.empty())
+{
+std::shared_ptr pState = 
aStates.back();
+{
+munchDrawCommands(pState->mpDrawCommands, 
m_rGraphics,
+  pSliderValue->maThumbRect.Left(),
+  pSliderValue->maThumbRect.Top(),
+  
pSliderValue->maThumbRect.GetWidth() - 1,
+  
pSliderValue->maThumbRect.GetHeight() - 1);
+bOK = true;
+}
+}
+}
+}
+}
+break;
 case ControlType::Fixedline:
 case ControlType::Toolbar:
 case ControlType::Menubar:
diff --git a/vcl/source/gdi/WidgetDefinitionReader.cxx 
b/vcl/source/gdi/WidgetDefinitionReader.cxx
index 799b3dda6187..9e4ed46f6f36 100644
--- a/vcl/source/gdi/WidgetDefinitionReader.cxx
+++ b/vcl/source/gdi/WidgetDefinitionReader.cxx
@@ -132,12 +132,11 @@ ControlPart xmlStringToControlPart(OString const& sPart)
 
 bool getControlTypeForXmlString(OString const& rString, ControlType& reType)
 {
-static std::unordered_map aPartMap = {
-{ "pushbutton", ControlType::Pushbutton }, { "radiobutton", 
ControlType::Radiobutton },
-{ "checkbox", ControlType::Checkbox }, { "combobox", 
ControlType::Combobox },
-{ "editbox", ControlType::Editbox },   { "scrollbar", 
ControlType::Scrollbar },
-{ "spinbox", ControlType::Spinbox },
-};
+static std::unordered_map aPartMap
+= { { "pushbutton", ControlType::Pushbutton }, { "radiobutton", 
ControlType::Radiobutton },
+{ "checkbox", ControlType::Checkbox }, { "combobox", 
ControlType::Combobox },
+{ "editbox", ControlType::Editbox },   { "scrollbar", 
ControlType::Scrollbar },
+{ "spinbox", ControlType::Spinbox },   { "slider", 
ControlType::Slider } };
 
 auto const& rIterator = aPartMap.find(rString);
 if (rIterator != aPartMap.end())
diff --git a/vcl/uiconfig/theme_definitions/definition.xml 
b/vcl/uiconfig/theme_definitions/definition.xml
index dca6e0e8963b..1286ea7fb8c9 100644
---

[Libreoffice-commits] core.git: vcl/source vcl/uiconfig

2018-04-29 Thread Maxim Monastirsky 
 vcl/source/control/edit.cxx |2 ++
 vcl/uiconfig/ui/editmenu.ui |2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3df6b510a6dfeb940a799aaefa9a5f550b384667
Author: Maxim Monastirsky 
Date:   Sun Apr 29 01:00:54 2018 +0300

Edit context menu should follow shortcuts visibility settings

Change-Id: Ief43683dca14fa1c92a6d253da07a7f79eeb6832
Reviewed-on: https://gerrit.libreoffice.org/53616
Tested-by: Jenkins 
Reviewed-by: Maxim Monastirsky 

diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 9d5204b82760..5832e8de55f9 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -2800,6 +2800,8 @@ VclPtr Edit::CreatePopupMenu()
 pPopup->SetAccelKey(pPopup->GetItemId("copy"), vcl::KeyCode( 
KeyFuncType::COPY));
 pPopup->SetAccelKey(pPopup->GetItemId("paste"), vcl::KeyCode( 
KeyFuncType::PASTE));
 pPopup->SetAccelKey(pPopup->GetItemId("delete"), vcl::KeyCode( 
KeyFuncType::DELETE));
+pPopup->SetAccelKey(pPopup->GetItemId("selectall"), vcl::KeyCode( 
KEY_A, false, true, false, false));
+pPopup->SetAccelKey(pPopup->GetItemId("specialchar"), vcl::KeyCode( 
KEY_S, true, true, false, false));
 }
 return pPopup;
 }
diff --git a/vcl/uiconfig/ui/editmenu.ui b/vcl/uiconfig/ui/editmenu.ui
index a9fb3508531c..522fd2e0ebb7 100644
--- a/vcl/uiconfig/ui/editmenu.ui
+++ b/vcl/uiconfig/ui/editmenu.ui
@@ -63,7 +63,6 @@
 False
 Select _All
 True
-
   
 
 
@@ -72,7 +71,6 @@
 False
 _Special Character...
 True
-
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/source vcl/uiconfig

2013-02-08 Thread Joren De Cuyper 
 vcl/source/window/builder.cxx  |   11 ++-
 vcl/uiconfig/ui/printdialog.ui |3 ++-
 2 files changed, 12 insertions(+), 2 deletions(-)

New commits:
commit f10ba07935951e6c74663a35de9a79b7d66beb37
Author: Joren De Cuyper joren.libreoff...@telenet.be
Date:   Fri Feb 8 14:34:02 2013 +0100

resolve fdo#60450 - Printer list is missing its border in Print dialog

Change-Id: I2e28b9f9d52bcb01b04f98d39d12b6d8a627bec5
Reviewed-on: https://gerrit.libreoffice.org/2043
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 98091a3..7ea7a85 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1031,7 +1031,16 @@ Window *VclBuilder::makeObject(Window *pParent, const 
OString name, const OStri
 //   everything over to SvTreeViewBox
 //d) remove the users of makeSvTreeViewBox
 extractModel(id, rMap);
-WinBits nWinStyle = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE;
+WinBits nWinStyle;
+OString sBorder = extractCustomProperty(rMap);
+if (sBorder.isEmpty())
+{
+nWinStyle = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE;
+}
+else
+{
+nWinStyle = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE|WB_BORDER;
+}
 //ListBox manages its own scrolling,
 Window *pRealParent = prepareWidgetOwnScrolling(pParent, nWinStyle);
 pWindow = new ListBox(pRealParent, nWinStyle);
diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index 22e759c..731d4c0 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -339,7 +339,7 @@
   /packing
 /child
 child
-  object class=GtkTreeView id=printers
+  object class=GtkTreeView 
id=printers:border
 property 
name=height_request100/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
@@ -362,6 +362,7 @@
   object class=GtkLabel id=label5
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=margin_top6/property
 property name=label 
translatable=yesPrinter/property
 attributes
   attribute name=weight value=bold/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/source vcl/uiconfig

2013-02-08 Thread Caolán McNamara 
 vcl/source/window/builder.cxx  |   12 +++-
 vcl/uiconfig/ui/printdialog.ui |1 -
 2 files changed, 3 insertions(+), 10 deletions(-)

New commits:
commit 9c427991d9658a870ee0eb1bdc4cd3b393c93fd5
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Feb 8 14:49:12 2013 +

janitorial tidying

Change-Id: I4f37cb4bcde935bfbf6d412f4c81ef0451245f00

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 7ea7a85..ba42b99 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1031,16 +1031,10 @@ Window *VclBuilder::makeObject(Window *pParent, const 
OString name, const OStri
 //   everything over to SvTreeViewBox
 //d) remove the users of makeSvTreeViewBox
 extractModel(id, rMap);
-WinBits nWinStyle;
+WinBits nWinStyle = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE;
 OString sBorder = extractCustomProperty(rMap);
-if (sBorder.isEmpty())
-{
-nWinStyle = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE;
-}
-else
-{
-nWinStyle = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE|WB_BORDER;
-}
+if (!sBorder.isEmpty())
+nWinStyle |= WB_BORDER;
 //ListBox manages its own scrolling,
 Window *pRealParent = prepareWidgetOwnScrolling(pParent, nWinStyle);
 pWindow = new ListBox(pRealParent, nWinStyle);
diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index 731d4c0..227063e 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -362,7 +362,6 @@
   object class=GtkLabel id=label5
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=margin_top6/property
 property name=label 
translatable=yesPrinter/property
 attributes
   attribute name=weight value=bold/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits