sw/source/ui/fldui/fldvar.cxx | 2 +-
sw/uiconfig/swriter/ui/fldvarpage.ui | 17 ++++++++++++-----
2 files changed, 13 insertions(+), 6 deletions(-)
New commits:
commit 7b11ebe90ae90560ffb56013abc9d405acd9389c
Author: Oliver Specht <oliver.spe...@cib.de>
AuthorDate: Wed Oct 9 07:51:56 2024 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Thu Dec 19 20:10:34 2024 +0100
tdf#160621 follow-up to fix height of field value
With 2b45427a567d1d52951b6f61aaea74147dab10cf the height and width
of the edit variable field dialog has been increased but that
didn't always work. Here the grid structure has been changed to
give more space to the value field.
Change-Id: I1ab0ee7cd31a046db95578801d435e988f039ac5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174714
Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
Reviewed-by: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
Tested-by: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
Tested-by: Jenkins
Signed-off-by: Xisco Fauli <xiscofa...@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178824
diff --git a/sw/uiconfig/swriter/ui/fldvarpage.ui
b/sw/uiconfig/swriter/ui/fldvarpage.ui
index d6bea58f3034..06394222e6cc 100644
--- a/sw/uiconfig/swriter/ui/fldvarpage.ui
+++ b/sw/uiconfig/swriter/ui/fldvarpage.ui
@@ -44,11 +44,10 @@
<column type="gchararray"/>
</columns>
</object>
- <!-- n-columns=3 n-rows=2 -->
+ <!-- n-columns=3 n-rows=4 -->
<object class="GtkGrid" id="FieldVarPage">
- <property name="width-request">700</property>
- <property name="height-request">400</property>
<property name="visible">True</property>
+ <property name="width-request">700</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
@@ -57,7 +56,7 @@
<property name="column-spacing">12</property>
<property name="column-homogeneous">True</property>
<child>
- <!-- n-columns=4 n-rows=2 -->
+ <!-- n-columns=4 n-rows=3 -->
<object class="GtkGrid" id="gdNameValue">
<property name="visible">True</property>
<property name="can-focus">False</property>
@@ -139,6 +138,7 @@
<property name="left-attach">1</property>
<property name="top-attach">1</property>
<property name="width">2</property>
+ <property name="height">2</property>
</packing>
</child>
<child>
@@ -191,17 +191,24 @@
</object>
<packing>
<property name="left-attach">3</property>
- <property name="top-attach">1</property>
+ <property name="top-attach">2</property>
</packing>
</child>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">1</property>
<property name="width">3</property>
+ <property name="height">3</property>
</packing>
</child>
<child>
commit 9e25a2ac615c2c1c0832a56b4afb4a526d9a5d6e
Author: Oliver Specht <oliver.spe...@cib.de>
AuthorDate: Mon Jul 22 09:42:41 2024 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Thu Dec 19 20:10:28 2024 +0100
related tdf#160621: request extra height for field value entry
With this, both edit and add fields dialog should look near-identical
at this spot (seems extra rows are needed for native dialogs like gtk,
while Windows wants the extra height-request).
Change-Id: Iafee3d60d33c9eee6020e9ef49aaac900222a0e6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170835
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
Signed-off-by: Xisco Fauli <xiscofa...@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178823
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index f690623a2dfa..c3a529650a17 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -73,7 +73,7 @@ SwFieldVarPage::SwFieldVarPage(weld::Container* pPage,
weld::DialogController* p
m_xNumFormatLB->get_widget().set_size_request(nWidth, nHeight/2);
m_xValueED->get_widget().set_size_request(m_xValueED->get_widget().get_preferred_size().Width(),
-
m_xValueED->get_widget().get_height_rows(3));
+
m_xValueED->get_widget().get_height_rows(6));
m_sOldValueFT = m_xValueFT->get_label();
m_sOldNameFT = m_xNameFT->get_label();
diff --git a/sw/uiconfig/swriter/ui/fldvarpage.ui
b/sw/uiconfig/swriter/ui/fldvarpage.ui
index 94782577de46..d6bea58f3034 100644
--- a/sw/uiconfig/swriter/ui/fldvarpage.ui
+++ b/sw/uiconfig/swriter/ui/fldvarpage.ui
@@ -46,8 +46,8 @@
</object>
<!-- n-columns=3 n-rows=2 -->
<object class="GtkGrid" id="FieldVarPage">
- <property name="width-request">600</property>
- <property name="height-request">300</property>
+ <property name="width-request">700</property>
+ <property name="height-request">400</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
