diff options
-rw-r--r-- | vcl/source/window/builder.cxx | 11 | ||||
-rw-r--r-- | vcl/uiconfig/ui/printdialog.ui | 3 |
2 files changed, 12 insertions, 2 deletions
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 98091a347a51..7ea7a85314b0 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 22e759c1213a..731d4c0cb2c2 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_request">100</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -362,6 +362,7 @@ <object class="GtkLabel" id="label5"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="margin_top">6</property> <property name="label" translatable="yes">Printer</property> <attributes> <attribute name="weight" value="bold"/> |