[PATCH] resolve fdo#60450 - Printer list is missing its border in Pr...

[Joren De Cuyper (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2042

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/42/2042/1

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

Change-Id: I756788a003d4c57612c1752f1b47de27aaf683f2
---
M vcl/uiconfig/ui/printdialog.ui
1 file changed, 1 insertion(+), 0 deletions(-)



diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index 22e759c..9106926 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -343,6 +343,7 @@
 property 
name=height_request100/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
+property name=border_width10/property
 child internal-child=selection
   object class=GtkTreeSelection 
id=treeview-selection/
 /child

-- 
To view, visit https://gerrit.libreoffice.org/2042
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I756788a003d4c57612c1752f1b47de27aaf683f2
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] resolve fdo#60450 - Printer list is missing its border in Pr...

[Joren De Cuyper (via Code Review)]

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2043

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/43/2043/1

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

Change-Id: I2e28b9f9d52bcb01b04f98d39d12b6d8a627bec5
---
M vcl/source/window/builder.cxx
M vcl/uiconfig/ui/printdialog.ui
2 files changed, 12 insertions(+), 2 deletions(-)



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 @@
 //   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 9106926..ec3d81a 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
@@ -363,6 +363,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/

-- 
To view, visit https://gerrit.libreoffice.org/2043
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2e28b9f9d52bcb01b04f98d39d12b6d8a627bec5
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice