[polari] lib: Fix FixedSizeFrame
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [polari] lib: Fix FixedSizeFrame
- Date: Wed, 23 Dec 2015 20:48:20 +0000 (UTC)
commit 865489ab107a7529e3afc8cd031def96bca71d08
Author: Florian Müllner <fmuellner gnome org>
Date: Wed Dec 23 21:32:17 2015 +0100
lib: Fix FixedSizeFrame
The non-width-for-height/for-width size request vfuncs stopped working
with recent GTK+ versions.
data/resources/main-window.ui | 1 -
src/lib/polari-fixed-size-frame.c | 24 +++++++++++++-----------
2 files changed, 13 insertions(+), 12 deletions(-)
---
diff --git a/data/resources/main-window.ui b/data/resources/main-window.ui
index ad747c6..7b86ede 100644
--- a/data/resources/main-window.ui
+++ b/data/resources/main-window.ui
@@ -183,7 +183,6 @@
<object class="GtkRevealer" id="room_list_revealer">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">start</property>
<property name="hexpand">False</property>
<property name="transition_type">slide-right</property>
<child>
diff --git a/src/lib/polari-fixed-size-frame.c b/src/lib/polari-fixed-size-frame.c
index de6f2db..d06510d 100644
--- a/src/lib/polari-fixed-size-frame.c
+++ b/src/lib/polari-fixed-size-frame.c
@@ -137,15 +137,16 @@ polari_fixed_size_frame_get_property (GObject *object,
}
static void
-polari_fixed_size_frame_get_preferred_width (GtkWidget *widget,
- int *minimum_size,
- int *natural_size)
+polari_fixed_size_frame_get_preferred_width_for_height (GtkWidget *widget,
+ int for_height,
+ int *minimum_size,
+ int *natural_size)
{
PolariFixedSizeFrame *self = POLARI_FIXED_SIZE_FRAME (widget);
if (self->priv->width == -1)
{
- GTK_WIDGET_CLASS (polari_fixed_size_frame_parent_class)->get_preferred_width (widget, minimum_size,
natural_size);
+ GTK_WIDGET_CLASS (polari_fixed_size_frame_parent_class)->get_preferred_width_for_height (widget,
for_height, minimum_size, natural_size);
}
else
{
@@ -154,9 +155,10 @@ polari_fixed_size_frame_get_preferred_width (GtkWidget *widget,
}
static void
-polari_fixed_size_frame_get_preferred_height (GtkWidget *widget,
- int *minimum_size,
- int *natural_size)
+polari_fixed_size_frame_get_preferred_height_for_width (GtkWidget *widget,
+ int for_width,
+ int *minimum_size,
+ int *natural_size)
{
PolariFixedSizeFrame *self = POLARI_FIXED_SIZE_FRAME (widget);
@@ -179,10 +181,10 @@ polari_fixed_size_frame_class_init (PolariFixedSizeFrameClass *klass)
object_class->get_property = polari_fixed_size_frame_get_property;
object_class->set_property = polari_fixed_size_frame_set_property;
- widget_class->get_preferred_width =
- polari_fixed_size_frame_get_preferred_width;
- widget_class->get_preferred_height =
- polari_fixed_size_frame_get_preferred_height;
+ widget_class->get_preferred_width_for_height =
+ polari_fixed_size_frame_get_preferred_width_for_height;
+ widget_class->get_preferred_height_for_width =
+ polari_fixed_size_frame_get_preferred_height_for_width;
gtk_container_class_handle_border_width (container_class);
props[PROP_WIDTH] =
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]