svx/uiconfig/ui/colorwindow.ui | 89 ++++++++++++++++++++--------------------- vcl/unx/gtk3/gtkinst.cxx | 4 + 2 files changed, 48 insertions(+), 45 deletions(-)
New commits: commit 0fff72154d0dbb44e09546ff59f8a5ec288dfd2e Author: Caolán McNamara <[email protected]> AuthorDate: Thu Jun 1 17:18:16 2023 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Thu Jun 1 20:16:22 2023 +0200 Resolves: tdf#155425 turn off overlay scrolling for color selector the overlay width is too close to the column width to easily select the colors in the column beside/underneath an overlay scrollbar Change-Id: I096a6f2414eb69f10a79a4a0591f3a210c6784de Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152507 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/svx/uiconfig/ui/colorwindow.ui b/svx/uiconfig/ui/colorwindow.ui index 27addb77194b..437f9e8719db 100644 --- a/svx/uiconfig/ui/colorwindow.ui +++ b/svx/uiconfig/ui/colorwindow.ui @@ -108,6 +108,7 @@ <property name="hscrollbar-policy">never</property> <property name="vscrollbar-policy">never</property> <property name="shadow-type">in</property> + <property name="overlay-scrolling">False</property> <child> <object class="GtkViewport"> <property name="visible">True</property> commit 068f28aa67bf7a17b722b3342689c845dda533f7 Author: Caolán McNamara <[email protected]> AuthorDate: Thu Jun 1 17:17:12 2023 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Thu Jun 1 20:16:15 2023 +0200 Related: tdf#155425 use preferred_size instead of allocated_width the scrollbar might not actually be visible so has no real allocated width yet Change-Id: Id15af9e481b9971bf79f16da16581f820f8303d8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152506 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx index 03c89ba40f68..29c95858e87f 100644 --- a/vcl/unx/gtk3/gtkinst.cxx +++ b/vcl/unx/gtk3/gtkinst.cxx @@ -8420,7 +8420,9 @@ public: { if (gtk_scrolled_window_get_overlay_scrolling(m_pScrolledWindow)) return 0; - return gtk_widget_get_allocated_width(gtk_scrolled_window_get_vscrollbar(m_pScrolledWindow)); + GtkRequisition size; + gtk_widget_get_preferred_size(gtk_scrolled_window_get_vscrollbar(m_pScrolledWindow), nullptr, &size); + return size.width; } virtual void set_scroll_thickness(int nThickness) override commit 1ae15fb6fdf7a1a537e51c4ed6973bb5d95a8ab0 Author: Caolán McNamara <[email protected]> AuthorDate: Thu Jun 1 17:04:36 2023 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Thu Jun 1 20:16:09 2023 +0200 resave with latest glade Change-Id: If9a61d218ccee6bb82adf533dc1932cb2dd46ad0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152505 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/svx/uiconfig/ui/colorwindow.ui b/svx/uiconfig/ui/colorwindow.ui index 7f7cf5fa90c6..27addb77194b 100644 --- a/svx/uiconfig/ui/colorwindow.ui +++ b/svx/uiconfig/ui/colorwindow.ui @@ -1,51 +1,51 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.22.1 --> +<!-- Generated with glade 3.40.0 --> <interface domain="svx"> <requires lib="gtk+" version="3.20"/> <object class="GtkImage" id="auto_icon"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">cmd/sc_square_unfilled.png</property> + <property name="can-focus">False</property> + <property name="icon-name">cmd/sc_square_unfilled.png</property> </object> <object class="GtkImage" id="custom_color_icon"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="margin-end">6</property> - <property name="icon_name">cmd/sc_colorsettings.png</property> + <property name="icon-name">cmd/sc_colorsettings.png</property> </object> <object class="GtkImage" id="none_icon"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">cmd/sc_square_unfilled.png</property> + <property name="can-focus">False</property> + <property name="icon-name">cmd/sc_square_unfilled.png</property> </object> <object class="GtkPopover" id="palette_popup_window"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="border_width">4</property> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="border-width">4</property> <property name="constrain-to">none</property> <child> <object class="GtkBox" id="container"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="spacing">6</property> <property name="homogeneous">True</property> <child> <object class="GtkButton" id="auto_color_button"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">True</property> - <property name="no_show_all">True</property> + <property name="can-focus">True</property> + <property name="can-default">True</property> + <property name="receives-default">True</property> + <property name="no-show-all">True</property> <property name="image">auto_icon</property> <property name="relief">none</property> - <property name="use_underline">True</property> + <property name="use-underline">True</property> <property name="xalign">0</property> - <property name="always_show_image">True</property> + <property name="always-show-image">True</property> </object> <packing> <property name="expand">False</property> @@ -56,15 +56,15 @@ <child> <object class="GtkButton" id="none_color_button"> <property name="label" translatable="yes" context="colorwindow|none_color_button">None</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">True</property> - <property name="no_show_all">True</property> + <property name="can-focus">True</property> + <property name="can-default">True</property> + <property name="receives-default">True</property> + <property name="no-show-all">True</property> <property name="image">none_icon</property> <property name="relief">none</property> - <property name="use_underline">True</property> + <property name="use-underline">True</property> <property name="xalign">0</property> - <property name="always_show_image">True</property> + <property name="always-show-image">True</property> </object> <packing> <property name="expand">False</property> @@ -82,7 +82,7 @@ <child> <object class="GtkSeparator" id="separator4"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> </object> <packing> <property name="expand">False</property> @@ -93,7 +93,7 @@ <child> <object class="GtkComboBoxText" id="palette_listbox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> </object> <packing> <property name="expand">False</property> @@ -104,19 +104,19 @@ <child> <object class="GtkScrolledWindow" id="colorsetwin"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">never</property> - <property name="vscrollbar_policy">never</property> - <property name="shadow_type">in</property> + <property name="can-focus">True</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> + <property name="can-focus">False</property> <child> <object class="GtkDrawingArea" id="colorset"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">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> @@ -132,7 +132,7 @@ <child> <object class="GtkSeparator" id="separator1"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> </object> <packing> <property name="expand">False</property> @@ -143,10 +143,10 @@ <child> <object class="GtkLabel" id="label1"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="colorwindow|label1">Recent</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">recent_colorset</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">recent_colorset</property> <property name="xalign">0</property> </object> <packing> @@ -158,8 +158,8 @@ <child> <object class="GtkDrawingArea" id="recent_colorset"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">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> <packing> @@ -171,7 +171,7 @@ <child> <object class="GtkSeparator" id="separator3"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> </object> <packing> <property name="expand">False</property> @@ -183,13 +183,13 @@ <object class="GtkButton" id="color_picker_button"> <property name="label" translatable="yes" context="colorwindow|color_picker_button">Custom Color…</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> <property name="image">custom_color_icon</property> <property name="relief">none</property> + <property name="use-underline">True</property> <property name="xalign">0</property> - <property name="use_underline">True</property> - <property name="always_show_image">True</property> + <property name="always-show-image">True</property> </object> <packing> <property name="expand">False</property>
