Federated_Computer/federated-calendar
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

project: remove GbScrolledWindow

Browse Source 
The max-content-height property was ported to GtkScrolledWindow,
which means we don't have to use a custom class anymore.
This commit is contained in:
Georges Basile Stavracas Neto
2016-06-17 18:18:38 -03:00
parent 3dbe4addeb
commit 33c7031164
5 changed files with 3 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.ac
+1 -1
View File
@@ -94,7 +94,7 @@ MAINTAINER_COMPILER_FLAGS=${MAINTAINER_COMPILER_FLAGS#* }
AC_SUBST(MAINTAINER_COMPILER_FLAGS)
GLIB_MIN_VERSION=2.43.4
GTK_MIN_VERSION=3.19.1
GTK_MIN_VERSION=3.21.1
ECAL_REQUIRED=3.13.90
EDATASERVER_REQUIRED=3.17.1
EDATASERVERUI_REQUIRED=3.17.1
data/ui/window.ui
+2 -3
View File
@@ -291,11 +291,10 @@
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GbScrolledWindow">
<object class="GtkScrolledWindow">
<property name="visible">True</property>
<property name="hscrollbar_policy">never</property>
<property name="min_content_height">80</property>
<property name="max_content_height">500</property>
<property name="max_content_height">450</property>
<child>
<object class="GtkListBox" id="calendar_listbox">
<property name="visible">True</property>
src/Makefile.am
-2
View File
@@ -20,8 +20,6 @@ BUILT_SOURCES = \
gnome_calendar_SOURCES = \
$(BUILT_SOURCES) \
gb-scrolled-window.h \
gb-scrolled-window.c \
e-cal-data-model-subscriber.h \
e-cal-data-model-subscriber.c \
e-cal-data-model.h \
src/gb-scrolled-window.c
-280
View File
@@ -1,280 +0,0 @@
/* gb-scrolled-window.c
*
* Copyright (C) 2014 Christian Hergert <christian@hergert.me>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <glib/gi18n.h>
#include "gb-scrolled-window.h"
typedef struct
{
gint max_content_height;
gint max_content_width;
} GbScrolledWindowPrivate;
G_DEFINE_TYPE_WITH_PRIVATE (GbScrolledWindow, gb_scrolled_window, GTK_TYPE_SCROLLED_WINDOW)
enum {
PROP_0,
PROP_MAX_CONTENT_HEIGHT,
PROP_MAX_CONTENT_WIDTH,
LAST_PROP
};
static GParamSpec *gParamSpecs [LAST_PROP];
GtkWidget *
gb_scrolled_window_new (void)
{
return g_object_new (GB_TYPE_SCROLLED_WINDOW, NULL);
}
static gint
gb_scrolled_window_get_max_content_height (GbScrolledWindow *self)
{
GbScrolledWindowPrivate *priv = gb_scrolled_window_get_instance_private (self);
g_return_val_if_fail (GB_IS_SCROLLED_WINDOW (self), -1);
return priv->max_content_height;
}
/**
* gb_scrolled_window_set_max_content_height:
* @max_content_height: the max allowed height request or -1 to ignore.
*
* This function will set the "max-content-height" property. This property is
* used to determine the maximum height that the scrolled window will request.
*
* This is useful if you want to have a scrolled window grow with the child
* allocation, but only up to a certain height.
*/
static void
gb_scrolled_window_set_max_content_height (GbScrolledWindow *self,
gint max_content_height)
{
GbScrolledWindowPrivate *priv = gb_scrolled_window_get_instance_private (self);
g_return_if_fail (GB_IS_SCROLLED_WINDOW (self));
if (max_content_height != priv->max_content_height)
{
priv->max_content_height = max_content_height;
g_object_notify_by_pspec (G_OBJECT (self), gParamSpecs [PROP_MAX_CONTENT_HEIGHT]);
gtk_widget_queue_resize (GTK_WIDGET (self));
}
}
static gint
gb_scrolled_window_get_max_content_width (GbScrolledWindow *self)
{
GbScrolledWindowPrivate *priv = gb_scrolled_window_get_instance_private (self);
g_return_val_if_fail (GB_IS_SCROLLED_WINDOW (self), -1);
return priv->max_content_width;
}
/**
* gb_scrolled_window_set_max_content_width:
* @max_content_width: the max allowed width request or -1 to ignore.
*
* This function will set the "max-content-width" property. This property is
* used to determine the maximum width that the scrolled window will request.
*
* This is useful if you want to have a scrolled window grow with the child
* allocation, but only up to a certain width.
*/
static void
gb_scrolled_window_set_max_content_width (GbScrolledWindow *self,
gint max_content_width)
{
GbScrolledWindowPrivate *priv = gb_scrolled_window_get_instance_private (self);
g_return_if_fail (GB_IS_SCROLLED_WINDOW (self));
if (max_content_width != priv->max_content_width)
{
priv->max_content_width = max_content_width;
g_object_notify_by_pspec (G_OBJECT (self), gParamSpecs [PROP_MAX_CONTENT_HEIGHT]);
gtk_widget_queue_resize (GTK_WIDGET (self));
}
}
static void
gb_scrolled_window_get_preferred_height (GtkWidget *widget,
gint *minimum_height,
gint *natural_height)
{
GbScrolledWindow *self = (GbScrolledWindow *)widget;
GbScrolledWindowPrivate *priv = gb_scrolled_window_get_instance_private (self);
g_return_if_fail (GB_IS_SCROLLED_WINDOW (self));
GTK_WIDGET_CLASS (gb_scrolled_window_parent_class)->get_preferred_height (widget, minimum_height, natural_height);
if (natural_height)
{
if (priv->max_content_height > -1)
{
GtkWidget *child;
GtkStyleContext *style;
GtkBorder border;
gint child_min_height;
gint child_nat_height;
gint additional;
if (!(child = gtk_bin_get_child (GTK_BIN (widget))))
return;
style = gtk_widget_get_style_context (widget);
gtk_style_context_get_border (style, gtk_widget_get_state_flags (widget), &border);
additional = border.top + border.bottom;
gtk_widget_get_preferred_height (child, &child_min_height, &child_nat_height);
if ((child_nat_height > *natural_height) && (priv->max_content_height > *natural_height))
*natural_height = MIN (priv->max_content_height, child_nat_height) + additional;
}
}
}
static void
gb_scrolled_window_get_preferred_width (GtkWidget *widget,
gint *minimum_width,
gint *natural_width)
{
GbScrolledWindow *self = (GbScrolledWindow *)widget;
GbScrolledWindowPrivate *priv = gb_scrolled_window_get_instance_private (self);
g_return_if_fail (GB_IS_SCROLLED_WINDOW (self));
GTK_WIDGET_CLASS (gb_scrolled_window_parent_class)->get_preferred_width (widget, minimum_width, natural_width);
if (natural_width)
{
if (priv->max_content_width > -1)
{
GtkWidget *child;
GtkStyleContext *style;
GtkBorder border;
gint child_min_width;
gint child_nat_width;
gint additional;
if (!(child = gtk_bin_get_child (GTK_BIN (widget))))
return;
style = gtk_widget_get_style_context (widget);
gtk_style_context_get_border (style, gtk_widget_get_state_flags (widget), &border);
additional = border.left = border.right + 1;
gtk_widget_get_preferred_width (child, &child_min_width, &child_nat_width);
if ((child_nat_width > *natural_width) && (priv->max_content_width > *natural_width))
*natural_width = MIN (priv->max_content_width, child_nat_width) + additional;
}
}
}
static void
gb_scrolled_window_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec)
{
GbScrolledWindow *self = GB_SCROLLED_WINDOW (object);
switch (prop_id)
{
case PROP_MAX_CONTENT_HEIGHT:
g_value_set_int (value, gb_scrolled_window_get_max_content_height (self));
break;
case PROP_MAX_CONTENT_WIDTH:
g_value_set_int (value, gb_scrolled_window_get_max_content_width (self));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
}
}
static void
gb_scrolled_window_set_property (GObject *object,
guint prop_id,
const GValue *value,
GParamSpec *pspec)
{
GbScrolledWindow *self = GB_SCROLLED_WINDOW (object);
switch (prop_id)
{
case PROP_MAX_CONTENT_HEIGHT:
gb_scrolled_window_set_max_content_height (self, g_value_get_int (value));
break;
case PROP_MAX_CONTENT_WIDTH:
gb_scrolled_window_set_max_content_width (self, g_value_get_int (value));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
}
}
static void
gb_scrolled_window_class_init (GbScrolledWindowClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
object_class->get_property = gb_scrolled_window_get_property;
object_class->set_property = gb_scrolled_window_set_property;
widget_class->get_preferred_width = gb_scrolled_window_get_preferred_width;
widget_class->get_preferred_height = gb_scrolled_window_get_preferred_height;
gParamSpecs [PROP_MAX_CONTENT_HEIGHT] =
g_param_spec_int ("max-content-height",
"Max Content Height",
"The maximum height request that can be made.",
-1,
G_MAXINT,
-1,
(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
gParamSpecs [PROP_MAX_CONTENT_WIDTH] =
g_param_spec_int ("max-content-width",
"Max Content Width",
"The maximum width request that can be made.",
-1,
G_MAXINT,
-1,
(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_properties (object_class, LAST_PROP, gParamSpecs);
}
static void
gb_scrolled_window_init (GbScrolledWindow *self)
{
GbScrolledWindowPrivate *priv = gb_scrolled_window_get_instance_private (self);
priv->max_content_height = -1;
priv->max_content_width = -1;
}
src/gb-scrolled-window.h
-39
View File
@@ -1,39 +0,0 @@
/* gb-scrolled-window.h
*
* Copyright (C) 2014 Christian Hergert <christian@hergert.me>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef GB_SCROLLED_WINDOW_H
#define GB_SCROLLED_WINDOW_H
#include <gtk/gtk.h>
G_BEGIN_DECLS
#define GB_TYPE_SCROLLED_WINDOW (gb_scrolled_window_get_type())
G_DECLARE_DERIVABLE_TYPE (GbScrolledWindow, gb_scrolled_window, GB, SCROLLED_WINDOW, GtkScrolledWindow)
struct _GbScrolledWindowClass
{
GtkScrolledWindowClass parent_class;
};
GtkWidget *gb_scrolled_window_new (void);
G_END_DECLS
#endif /* GB_SCROLLED_WINDOW_H */