varun-r-mallya/sysprof
1
0
Fork 0
mirror of https://github.com/varun-r-mallya/sysprof.git synced 2025-12-31 20:36:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move from SpScrolledWindow to GtkScrolledWindow

Browse Source 
GtkScrolledWindow has max-content-{width,height} properties now. Remove
SpScrolledWindow and bump the gtk+ requirement to 3.21.3 at the same
time.
This commit is contained in:
Timm Bäder
2016-06-10 21:12:06 +02:00
parent 03ecb8ddfe
commit 15a2873c25
6 changed files with 3 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -94,7 +94,7 @@ dnl ***********************************************************************
dnl Check for required packages
dnl ***********************************************************************
m4_define([glib_required_version], [2.44.0])
m4_define([gtk_required_version], [3.16.0])
m4_define([gtk_required_version], [3.21.3])
m4_define([systemd_required_version], [222])
PKG_CHECK_MODULES(GIO,

2
lib/Makefile.am
View File

@ -140,7 +140,6 @@ uiheaders_DATA = \
sp-process-model-row.h \
sp-profiler-menu-button.h \
sp-recording-state-view.h \
sp-scrolled-window.h \
sysprof-ui.h \
$(NULL)
@ -156,7 +155,6 @@ libsysprof_ui_@API_VERSION@_la_SOURCES = \
sp-process-model-row.c \
sp-profiler-menu-button.c \
sp-recording-state-view.c \
sp-scrolled-window.c \
$(NULL)
libsysprof_ui_@API_VERSION@_la_CFLAGS = \

4
lib/resources/ui/sp-profiler-menu-button.ui
View File

@ -95,7 +95,7 @@
</object>
</child>
<child>
<object class="SpScrolledWindow">
<object class="GtkScrolledWindow">
<property name="expand">true</property>
<property name="min-content-width">100</property>
<property name="max-content-width">400</property>
@ -162,7 +162,7 @@
</object>
</child>
<child>
<object class="SpScrolledWindow">
<object class="GtkScrolledWindow">
<property name="shadow-type">in</property>
<property name="min-content-height">100</property>
<property name="max-content-height">400</property>

280
lib/sp-scrolled-window.c
View File

@ -1,280 +0,0 @@
/* sp-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 "sp-scrolled-window.h"
typedef struct
{
gint max_content_height;
gint max_content_width;
} SpScrolledWindowPrivate;
G_DEFINE_TYPE_WITH_PRIVATE (SpScrolledWindow, sp_scrolled_window, GTK_TYPE_SCROLLED_WINDOW)
enum {
PROP_0,
PROP_MAX_CONTENT_HEIGHT,
PROP_MAX_CONTENT_WIDTH,
LAST_PROP
};
static GParamSpec *properties [LAST_PROP];
GtkWidget *
sp_scrolled_window_new (void)
{
return g_object_new (SP_TYPE_SCROLLED_WINDOW, NULL);
}
gint
sp_scrolled_window_get_max_content_height (SpScrolledWindow *self)
{
SpScrolledWindowPrivate *priv = sp_scrolled_window_get_instance_private (self);
g_return_val_if_fail (SP_IS_SCROLLED_WINDOW (self), -1);
return priv->max_content_height;
}
/**
* sp_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.
*/
void
sp_scrolled_window_set_max_content_height (SpScrolledWindow *self,
gint max_content_height)
{
SpScrolledWindowPrivate *priv = sp_scrolled_window_get_instance_private (self);
g_return_if_fail (SP_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), properties [PROP_MAX_CONTENT_HEIGHT]);
gtk_widget_queue_resize (GTK_WIDGET (self));
}
}
gint
sp_scrolled_window_get_max_content_width (SpScrolledWindow *self)
{
SpScrolledWindowPrivate *priv = sp_scrolled_window_get_instance_private (self);
g_return_val_if_fail (SP_IS_SCROLLED_WINDOW (self), -1);
return priv->max_content_width;
}
/**
* sp_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.
*/
void
sp_scrolled_window_set_max_content_width (SpScrolledWindow *self,
gint max_content_width)
{
SpScrolledWindowPrivate *priv = sp_scrolled_window_get_instance_private (self);
g_return_if_fail (SP_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), properties [PROP_MAX_CONTENT_HEIGHT]);
gtk_widget_queue_resize (GTK_WIDGET (self));
}
}
static void
sp_scrolled_window_get_preferred_height (GtkWidget *widget,
gint *minimum_height,
gint *natural_height)
{
SpScrolledWindow *self = (SpScrolledWindow *)widget;
SpScrolledWindowPrivate *priv = sp_scrolled_window_get_instance_private (self);
g_return_if_fail (SP_IS_SCROLLED_WINDOW (self));
GTK_WIDGET_CLASS (sp_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_style_context_get_state (style), &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
sp_scrolled_window_get_preferred_width (GtkWidget *widget,
gint *minimum_width,
gint *natural_width)
{
SpScrolledWindow *self = (SpScrolledWindow *)widget;
SpScrolledWindowPrivate *priv = sp_scrolled_window_get_instance_private (self);
g_return_if_fail (SP_IS_SCROLLED_WINDOW (self));
GTK_WIDGET_CLASS (sp_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_style_context_get_state (style), &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
sp_scrolled_window_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec)
{
SpScrolledWindow *self = SP_SCROLLED_WINDOW (object);
switch (prop_id)
{
case PROP_MAX_CONTENT_HEIGHT:
g_value_set_int (value, sp_scrolled_window_get_max_content_height (self));
break;
case PROP_MAX_CONTENT_WIDTH:
g_value_set_int (value, sp_scrolled_window_get_max_content_width (self));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
}
}
static void
sp_scrolled_window_set_property (GObject *object,
guint prop_id,
const GValue *value,
GParamSpec *pspec)
{
SpScrolledWindow *self = SP_SCROLLED_WINDOW (object);
switch (prop_id)
{
case PROP_MAX_CONTENT_HEIGHT:
sp_scrolled_window_set_max_content_height (self, g_value_get_int (value));
break;
case PROP_MAX_CONTENT_WIDTH:
sp_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
sp_scrolled_window_class_init (SpScrolledWindowClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
object_class->get_property = sp_scrolled_window_get_property;
object_class->set_property = sp_scrolled_window_set_property;
widget_class->get_preferred_width = sp_scrolled_window_get_preferred_width;
widget_class->get_preferred_height = sp_scrolled_window_get_preferred_height;
properties [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));
properties [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, properties);
}
static void
sp_scrolled_window_init (SpScrolledWindow *self)
{
SpScrolledWindowPrivate *priv = sp_scrolled_window_get_instance_private (self);
priv->max_content_height = -1;
priv->max_content_width = -1;
}

45
lib/sp-scrolled-window.h
View File

@ -1,45 +0,0 @@
/* sp-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 SP_SCROLLED_WINDOW_H
#define SP_SCROLLED_WINDOW_H
#include <gtk/gtk.h>
G_BEGIN_DECLS
#define SP_TYPE_SCROLLED_WINDOW (sp_scrolled_window_get_type())
G_DECLARE_DERIVABLE_TYPE (SpScrolledWindow, sp_scrolled_window, SP, SCROLLED_WINDOW, GtkScrolledWindow)
struct _SpScrolledWindowClass
{
GtkScrolledWindowClass parent_class;
};
GtkWidget *sp_scrolled_window_new (void);
gint sp_scrolled_window_get_max_content_height (SpScrolledWindow *self);
void sp_scrolled_window_set_max_content_height (SpScrolledWindow *self,
gint max_content_height);
gint sp_scrolled_window_get_max_content_width (SpScrolledWindow *self);
void sp_scrolled_window_set_max_content_width (SpScrolledWindow *self,
gint max_content_width);
G_END_DECLS
#endif /* SP_SCROLLED_WINDOW_H */

1
lib/sysprof-ui.h
View File

@ -33,7 +33,6 @@ G_BEGIN_DECLS
# include "sp-process-model-item.h"
# include "sp-process-model-row.h"
# include "sp-profiler-menu-button.h"
# include "sp-scrolled-window.h"
#undef SYSPROF_INSIDE
G_END_DECLS