Skip to content

C
core
Kaydet (Commit) d3f10f80 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

include scrollbar width in optimalsize if vert scrollbar is always shown 

Change-Id: I9704b5becf6f0003233be2b3aa78b4b21a91fae7
üst cc71e03d
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 39 deletions
sw/uiconfig/swriter/ui/autoformattable.ui
Dosyayı görüntüle @ d3f10f80
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires LibreOffice 1.0 -->
<object class="GtkDialog" id="AutoFormatTableDialog">
<property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="border_width">6</property>
<property name="title" translatable="yes">AutoFormat</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
<property name="spacing">2</property>
<property name="spacing">12</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="can_focus">False</property>
......@@ -19,12 +20,10 @@
<child>
<object class="GtkButton" id="ok">
<property name="label">gtk-ok</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_default">True</property>
<property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
......@@ -36,11 +35,9 @@
<child>
<object class="GtkButton" id="cancel">
<property name="label">gtk-cancel</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
......@@ -52,11 +49,9 @@
<child>
<object class="GtkButton" id="help">
<property name="label">gtk-help</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
......@@ -68,11 +63,9 @@
<child>
<object class="GtkButton" id="add">
<property name="label">gtk-add</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
......@@ -84,11 +77,9 @@
<child>
<object class="GtkButton" id="remove">
<property name="label">gtk-delete</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
......@@ -100,11 +91,9 @@
<child>
<object class="GtkButton" id="rename">
<property name="label" translatable="yes">Rename</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
</object>
<packing>
<property name="expand">False</property>
......@@ -125,6 +114,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkFrame" id="format">
<property name="visible">True</property>
......@@ -135,6 +125,7 @@
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkGrid" id="grid2">
......@@ -145,32 +136,37 @@
<property name="row_spacing">6</property>
<property name="column_spacing">6</property>
<child>
<object class="GtkTreeView" id="formatlb">
<object class="swuilo-AutoFmtPreview" id="preview">
<property name="width_request">200</property>
<property name="height_request">200</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="treeview-selection1"/>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="swuilo-AutoFmtPreview" id="preview">
<property name="width_request">200</property>
<property name="height_request">200</property>
<object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="can_focus">True</property>
<property name="vscrollbar_policy">always</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="formatlb">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="vexpand">True</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
......@@ -207,21 +203,20 @@
<object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkGrid" id="grid4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="row_spacing">5</property>
<property name="column_spacing">5</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<child>
<object class="GtkCheckButton" id="numformatcb">
<property name="label" translatable="yes">Number format</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
......@@ -235,11 +230,9 @@
<child>
<object class="GtkCheckButton" id="bordercb">
<property name="label" translatable="yes">Borders</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
......@@ -253,11 +246,9 @@
<child>
<object class="GtkCheckButton" id="fontcb">
<property name="label" translatable="yes">Font</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
......@@ -271,11 +262,9 @@
<child>
<object class="GtkCheckButton" id="patterncb">
<property name="label" translatable="yes">Pattern</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
......@@ -289,11 +278,9 @@
<child>
<object class="GtkCheckButton" id="alignmentcb">
<property name="label" translatable="yes">Alignment</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
......
vcl/source/control/lstbox.cxx
Dosyayı görüntüle @ d3f10f80
......@@ -1291,11 +1291,19 @@ Size ListBox::CalcMinimumSize() const
aSz = CalcSubEditSize();
bool bAddScrollWidth = false;
if (IsDropDownBox())
{
aSz.Height() += 4; // add a space between entry and border
aSz.Width() += 4; // add a little breathing space
bAddScrollWidth = true;
}
else
bAddScrollWidth = (GetStyle() & WB_VSCROLL) == WB_VSCROLL;
if (bAddScrollWidth)
{
// try native borders; scrollbar size may not be a good indicator
// see how large the edit area inside is to estimate what is needed for the dropdown
ImplControlValue aControlValue;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment