Kaydet (Commit) e910123e authored tarafından Caolán McNamara's avatar Caolán McNamara

make border property of multiline edit optional

Change-Id: Ideeda46baf3d96dd52a77b5d225df3c00153183e
üst a6023391
...@@ -202,7 +202,7 @@ ...@@ -202,7 +202,7 @@
<property name="vscrollbar_policy">always</property> <property name="vscrollbar_policy">always</property>
<property name="shadow_type">in</property> <property name="shadow_type">in</property>
<child> <child>
<object class="GtkTextView" id="edit"> <object class="GtkTextView" id="edit:border">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
......
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
<property name="vscrollbar_policy">always</property> <property name="vscrollbar_policy">always</property>
<property name="shadow_type">in</property> <property name="shadow_type">in</property>
<child> <child>
<object class="GtkTextView" id="pluginoptions"> <object class="GtkTextView" id="pluginoptions:border">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="wrap_mode">char</property> <property name="wrap_mode">char</property>
......
...@@ -299,7 +299,7 @@ ...@@ -299,7 +299,7 @@
<property name="vexpand">True</property> <property name="vexpand">True</property>
<property name="shadow_type">in</property> <property name="shadow_type">in</property>
<child> <child>
<object class="GtkTextView" id="description"> <object class="GtkTextView" id="description:border">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="editable">False</property> <property name="editable">False</property>
......
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
<property name="vscrollbar_policy">always</property> <property name="vscrollbar_policy">always</property>
<property name="shadow_type">in</property> <property name="shadow_type">in</property>
<child> <child>
<object class="GtkTextView" id="desc_entry"> <object class="GtkTextView" id="desc_entry:border">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="wrap_mode">word</property> <property name="wrap_mode">word</property>
......
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
<property name="top_padding">6</property> <property name="top_padding">6</property>
<property name="left_padding">12</property> <property name="left_padding">12</property>
<child> <child>
<object class="GtkTextView" id="VersionComment"> <object class="GtkTextView" id="VersionComment:border">
<property name="width_request">300</property> <property name="width_request">300</property>
<property name="height_request">150</property> <property name="height_request">150</property>
<property name="visible">True</property> <property name="visible">True</property>
......
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
<property name="vscrollbar_policy">always</property> <property name="vscrollbar_policy">always</property>
<property name="shadow_type">in</property> <property name="shadow_type">in</property>
<child> <child>
<object class="GtkTextView" id="comments"> <object class="GtkTextView" id="comments:border">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
......
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkTextView" id="namero"> <object class="GtkTextView" id="namero:border">
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="no_show_all">True</property> <property name="no_show_all">True</property>
<property name="valign">center</property> <property name="valign">center</property>
......
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="shadow_type">in</property> <property name="shadow_type">in</property>
<child> <child>
<object class="GtkTextView" id="textentry"> <object class="GtkTextView" id="textentry:border">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
</object> </object>
......
...@@ -1185,7 +1185,10 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri ...@@ -1185,7 +1185,10 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri
{ {
extractBuffer(id, rMap); extractBuffer(id, rMap);
WinBits nWinStyle = WB_LEFT | WB_BORDER; WinBits nWinStyle = WB_LEFT;
OString sBorder = extractCustomProperty(rMap);
if (!sBorder.isEmpty())
nWinStyle |= WB_BORDER;
//VclMultiLineEdit manages its own scrolling, //VclMultiLineEdit manages its own scrolling,
Window *pRealParent = prepareWidgetOwnScrolling(pParent, nWinStyle); Window *pRealParent = prepareWidgetOwnScrolling(pParent, nWinStyle);
pWindow = new VclMultiLineEdit(pRealParent, nWinStyle); pWindow = new VclMultiLineEdit(pRealParent, nWinStyle);
......
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