cui/source/tabpages/border.cxx | 4 ++--
cui/uiconfig/ui/borderpage.ui | 40 ++++------------------------------------
2 files changed, 6 insertions(+), 38 deletions(-)
New commits:
commit da50f3e15e38474a51361bdddbc0951dec5674bf
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Oct 16 11:57:02 2019 +0100
Commit: Heiko Tietze <heiko.tie...@documentfoundation.org>
CommitDate: Thu Oct 17 16:32:02 2019 +0200
tdf#125508 remove border frame from shadows and presets
Change-Id: I022f64188e49553bd7bef38cdd51620dfa0b90cd
Reviewed-on: https://gerrit.libreoffice.org/80883
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 57534beb059c..84bdcd8f92c1 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -245,7 +245,7 @@ SvxBorderTabPage::SvxBorderTabPage(weld::Container* pPage,
weld::DialogControlle
, mbSync(true)
, mbRemoveAdjacentCellBorders(false)
, bIsCalcDoc(false)
- , m_xWndPresets(new
SvtValueSet(m_xBuilder->weld_scrolled_window("presetswin")))
+ , m_xWndPresets(new SvtValueSet(nullptr))
, m_xWndPresetsWin(new weld::CustomWeld(*m_xBuilder, "presets",
*m_xWndPresets))
, m_xUserDefFT(m_xBuilder->weld_label("userdefft"))
, m_xFrameSelWin(new weld::CustomWeld(*m_xBuilder, "framesel",
m_aFrameSel))
@@ -263,7 +263,7 @@ SvxBorderTabPage::SvxBorderTabPage(weld::Container* pPage,
weld::DialogControlle
, m_xBottomMF(m_xBuilder->weld_metric_spin_button("bottommf",
FieldUnit::MM))
, m_xSynchronizeCB(m_xBuilder->weld_check_button("sync"))
, m_xShadowFrame(m_xBuilder->weld_container("shadow"))
- , m_xWndShadows(new
SvtValueSet(m_xBuilder->weld_scrolled_window("shadowswin")))
+ , m_xWndShadows(new SvtValueSet(nullptr))
, m_xWndShadowsWin(new weld::CustomWeld(*m_xBuilder, "shadows",
*m_xWndShadows))
, m_xFtShadowSize(m_xBuilder->weld_label("distanceft"))
, m_xEdShadowSize(m_xBuilder->weld_metric_spin_button("distancemf",
FieldUnit::MM))
diff --git a/cui/uiconfig/ui/borderpage.ui b/cui/uiconfig/ui/borderpage.ui
index 5cc25655f7ef..d81f70ae2fd8 100644
--- a/cui/uiconfig/ui/borderpage.ui
+++ b/cui/uiconfig/ui/borderpage.ui
@@ -122,26 +122,10 @@
</packing>
</child>
<child>
- <object class="GtkScrolledWindow" id="presetswin">
+ <object class="GtkDrawingArea" id="presets">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="halign">start</property>
- <property name="hscrollbar_policy">never</property>
- <property name="vscrollbar_policy">never</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkViewport">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkDrawingArea" id="presets">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_BUTTON_PRESS_MASK
| GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK |
GDK_STRUCTURE_MASK</property>
- </object>
- </child>
- </object>
- </child>
+ <property name="events">GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK |
GDK_STRUCTURE_MASK</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -522,26 +506,10 @@
<property name="hexpand">True</property>
<property name="row_spacing">6</property>
<child>
- <object class="GtkScrolledWindow" id="shadowswin">
+ <object class="GtkDrawingArea" id="shadows">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="halign">start</property>
- <property name="hscrollbar_policy">never</property>
- <property name="vscrollbar_policy">never</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkViewport">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkDrawingArea" id="shadows">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="events">GDK_BUTTON_PRESS_MASK
| GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK |
GDK_STRUCTURE_MASK</property>
- </object>
- </child>
- </object>
- </child>
+ <property name="events">GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK |
GDK_STRUCTURE_MASK</property>
</object>
<packing>
<property name="left_attach">0</property>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
