* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
/*
#include "gtkinfobar.h"
#include "gtkaccessible.h"
#include "gtkbuildable.h"
+#include "gtkbbox.h"
#include "gtkbox.h"
-#include "gtkvbbox.h"
#include "gtklabel.h"
#include "gtkbutton.h"
#include "gtkenums.h"
#include "gtkintl.h"
#include "gtkprivate.h"
#include "gtkstock.h"
-#include "gdkkeysyms.h"
+#include "gtkorientable.h"
+#include "gtktypebuiltins.h"
/**
* SECTION:gtkinfobar
* GTK_STOCK_OK, GTK_RESPONSE_OK);
* g_signal_connect (info_bar, "response",
* G_CALLBACK (gtk_widget_hide), NULL);
- * gtk_table_attach (GTK_TABLE (table),
- * info_bar,
- * 0, 1, 2, 3,
- * GTK_EXPAND | GTK_FILL, 0,
- * 0, 0);
+ * gtk_grid_attach (GTK_GRID (grid),
+ * info_bar,
+ * 0, 2, 1, 1);
*
* /* ... */
*
static guint signals[LAST_SIGNAL];
+#define ACTION_AREA_DEFAULT_BORDER 5
+#define ACTION_AREA_DEFAULT_SPACING 6
+#define CONTENT_AREA_DEFAULT_BORDER 8
+#define CONTENT_AREA_DEFAULT_SPACING 16
static void gtk_info_bar_set_property (GObject *object,
guint prop_id,
guint prop_id,
GValue *value,
GParamSpec *pspec);
-static void gtk_info_bar_style_set (GtkWidget *widget,
- GtkStyle *prev_style);
-static gboolean gtk_info_bar_draw (GtkWidget *widget,
- cairo_t *cr);
+static void gtk_info_bar_get_preferred_width (GtkWidget *widget,
+ gint *minimum_width,
+ gint *natural_width);
+static void gtk_info_bar_get_preferred_height (GtkWidget *widget,
+ gint *minimum_height,
+ gint *natural_height);
+static gboolean gtk_info_bar_draw (GtkWidget *widget,
+ cairo_t *cr);
static void gtk_info_bar_buildable_interface_init (GtkBuildableIface *iface);
static GObject *gtk_info_bar_buildable_get_internal_child (GtkBuildable *buildable,
GtkBuilder *builder,
gpointer user_data);
-G_DEFINE_TYPE_WITH_CODE (GtkInfoBar, gtk_info_bar, GTK_TYPE_HBOX,
+G_DEFINE_TYPE_WITH_CODE (GtkInfoBar, gtk_info_bar, GTK_TYPE_BOX,
G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE,
gtk_info_bar_buildable_interface_init))
const GValue *value,
GParamSpec *pspec)
{
- GtkInfoBar *info_bar;
- GtkInfoBarPrivate *priv;
-
- info_bar = GTK_INFO_BAR (object);
- priv = info_bar->priv;
+ GtkInfoBar *info_bar = GTK_INFO_BAR (object);
switch (prop_id)
{
GValue *value,
GParamSpec *pspec)
{
- GtkInfoBar *info_bar;
- GtkInfoBarPrivate *priv;
-
- info_bar = GTK_INFO_BAR (object);
- priv = info_bar->priv;
+ GtkInfoBar *info_bar = GTK_INFO_BAR (object);
switch (prop_id)
{
GTK_RESPONSE_CANCEL);
}
+static void
+get_padding_and_border (GtkWidget *widget,
+ GtkBorder *border)
+{
+ GtkStyleContext *context;
+ GtkStateFlags state;
+ GtkBorder tmp;
+
+ context = gtk_widget_get_style_context (widget);
+ state = gtk_widget_get_state_flags (widget);
+
+ gtk_style_context_get_padding (context, state, border);
+ gtk_style_context_get_border (context, state, &tmp);
+ border->top += tmp.top;
+ border->right += tmp.right;
+ border->bottom += tmp.bottom;
+ border->left += tmp.left;
+}
+
+static void
+gtk_info_bar_get_preferred_width (GtkWidget *widget,
+ gint *minimum_width,
+ gint *natural_width)
+{
+ GtkBorder border;
+
+ get_padding_and_border (widget, &border);
+
+ GTK_WIDGET_CLASS (gtk_info_bar_parent_class)->get_preferred_width (widget,
+ minimum_width,
+ natural_width);
+
+ if (minimum_width)
+ *minimum_width += border.left + border.right;
+ if (natural_width)
+ *natural_width += border.left + border.right;
+}
+
+static void
+gtk_info_bar_get_preferred_height (GtkWidget *widget,
+ gint *minimum_height,
+ gint *natural_height)
+{
+ GtkBorder border;
+
+ get_padding_and_border (widget, &border);
+
+ GTK_WIDGET_CLASS (gtk_info_bar_parent_class)->get_preferred_height (widget,
+ minimum_height,
+ natural_height);
+
+ if (minimum_height)
+ *minimum_height += border.top + border.bottom;
+ if (natural_height)
+ *natural_height += border.top + border.bottom;
+}
+
static gboolean
-gtk_info_bar_draw (GtkWidget *widget,
- cairo_t *cr)
+gtk_info_bar_draw (GtkWidget *widget,
+ cairo_t *cr)
{
- GtkInfoBarPrivate *priv = GTK_INFO_BAR (widget)->priv;
- const char* type_detail[] = {
- "infobar-info",
- "infobar-warning",
- "infobar-question",
- "infobar-error",
- "infobar"
- };
-
- if (priv->message_type != GTK_MESSAGE_OTHER)
- {
- const char *detail;
-
- detail = type_detail[priv->message_type];
-
- gtk_paint_box (gtk_widget_get_style (widget),
- cr,
- GTK_STATE_NORMAL,
- GTK_SHADOW_OUT,
- widget,
- detail,
- 0, 0,
- gtk_widget_get_allocated_width (widget),
- gtk_widget_get_allocated_height (widget));
- }
+ GtkStyleContext *context;
+
+ context = gtk_widget_get_style_context (widget);
- if (GTK_WIDGET_CLASS (gtk_info_bar_parent_class)->draw)
- GTK_WIDGET_CLASS (gtk_info_bar_parent_class)->draw (widget, cr);
+ gtk_render_background (context, cr, 0, 0,
+ gtk_widget_get_allocated_width (widget),
+ gtk_widget_get_allocated_height (widget));
+ gtk_render_frame (context, cr, 0, 0,
+ gtk_widget_get_allocated_width (widget),
+ gtk_widget_get_allocated_height (widget));
+
+ GTK_WIDGET_CLASS (gtk_info_bar_parent_class)->draw (widget, cr);
return FALSE;
}
object_class->set_property = gtk_info_bar_set_property;
object_class->finalize = gtk_info_bar_finalize;
- widget_class->style_set = gtk_info_bar_style_set;
+ widget_class->get_preferred_width = gtk_info_bar_get_preferred_width;
+ widget_class->get_preferred_height = gtk_info_bar_get_preferred_height;
widget_class->draw = gtk_info_bar_draw;
klass->close = gtk_info_bar_close;
* content area of the info bar.
*
* Since: 2.18
+ * Deprecated: 3.6: Use gtk_container_set_border_width()
*/
gtk_widget_class_install_style_property (widget_class,
g_param_spec_int ("content-area-border",
P_("Width of border around the content area"),
0,
G_MAXINT,
- 8,
+ CONTENT_AREA_DEFAULT_BORDER,
GTK_PARAM_READABLE));
/**
* content area of the info bar.
*
* Since: 2.18
+ * Deprecated: 3.6: Use gtk_box_set_spacing()
*/
gtk_widget_class_install_style_property (widget_class,
g_param_spec_int ("content-area-spacing",
P_("Spacing between elements of the area"),
0,
G_MAXINT,
- 16,
+ CONTENT_AREA_DEFAULT_SPACING,
GTK_PARAM_READABLE));
/**
* Spacing between buttons in the action area of the info bar.
*
* Since: 2.18
+ * Deprecated: 3.6: Use gtk_box_set_spacing()
*/
gtk_widget_class_install_style_property (widget_class,
g_param_spec_int ("button-spacing",
P_("Spacing between buttons"),
0,
G_MAXINT,
- 6,
+ ACTION_AREA_DEFAULT_SPACING,
GTK_PARAM_READABLE));
/**
* Width of the border around the action area of the info bar.
*
* Since: 2.18
+ * Deprecated: 3.6: Use gtk_container_set_border_width()
*/
gtk_widget_class_install_style_property (widget_class,
g_param_spec_int ("action-area-border",
P_("Width of border around the action area"),
0,
G_MAXINT,
- 5,
+ ACTION_AREA_DEFAULT_BORDER,
GTK_PARAM_READABLE));
binding_set = gtk_binding_set_by_class (klass);
g_type_class_add_private (object_class, sizeof (GtkInfoBarPrivate));
}
-static void
-gtk_info_bar_update_colors (GtkInfoBar *info_bar)
-{
- GtkWidget *widget = GTK_WIDGET (info_bar);
- GtkInfoBarPrivate *priv = info_bar->priv;
- GdkColor info_default_border_color = { 0, 0xb800, 0xad00, 0x9d00 };
- GdkColor info_default_fill_color = { 0, 0xff00, 0xff00, 0xbf00 };
- GdkColor warning_default_border_color = { 0, 0xb000, 0x7a00, 0x2b00 };
- GdkColor warning_default_fill_color = { 0, 0xfc00, 0xaf00, 0x3e00 };
- GdkColor question_default_border_color = { 0, 0x6200, 0x7b00, 0xd960 };
- GdkColor question_default_fill_color = { 0, 0x8c00, 0xb000, 0xd700 };
- GdkColor error_default_border_color = { 0, 0xa800, 0x2700, 0x2700 };
- GdkColor error_default_fill_color = { 0, 0xf000, 0x3800, 0x3800 };
- GdkColor other_default_border_color = { 0, 0xb800, 0xad00, 0x9d00 };
- GdkColor other_default_fill_color = { 0, 0xff00, 0xff00, 0xbf00 };
- GdkColor *fg, *bg;
- GdkColor sym_fg, sym_bg;
- GtkStyle *style;
- const char* fg_color_name[] = {
- "info_fg_color",
- "warning_fg_color",
- "question_fg_color",
- "error_fg_color",
- "other_fg_color"
- };
- const char* bg_color_name[] = {
- "info_bg_color",
- "warning_bg_color",
- "question_bg_color",
- "error_bg_color",
- "other_bg_color"
- };
-
- style = gtk_widget_get_style (widget);
-
- if (gtk_style_lookup_color (style, fg_color_name[priv->message_type], &sym_fg) &&
- gtk_style_lookup_color (style, bg_color_name[priv->message_type], &sym_bg))
- {
- fg = &sym_fg;
- bg = &sym_bg;
- }
- else
- {
- switch (priv->message_type)
- {
- case GTK_MESSAGE_INFO:
- fg = &info_default_border_color;
- bg = &info_default_fill_color;
- break;
-
- case GTK_MESSAGE_WARNING:
- fg = &warning_default_border_color;
- bg = &warning_default_fill_color;
- break;
-
- case GTK_MESSAGE_QUESTION:
- fg = &question_default_border_color;
- bg = &question_default_fill_color;
- break;
-
- case GTK_MESSAGE_ERROR:
- fg = &error_default_border_color;
- bg = &error_default_fill_color;
- break;
-
- case GTK_MESSAGE_OTHER:
- fg = &other_default_border_color;
- bg = &other_default_fill_color;
- break;
-
- default:
- g_assert_not_reached();
- fg = NULL;
- bg = NULL;
- }
- }
-
- if (!gdk_color_equal (bg, &style->bg[GTK_STATE_NORMAL]))
- gtk_widget_modify_bg (widget, GTK_STATE_NORMAL, bg);
- if (!gdk_color_equal (fg, &style->fg[GTK_STATE_NORMAL]))
- gtk_widget_modify_fg (widget, GTK_STATE_NORMAL, fg);
-}
-
-static void
-gtk_info_bar_style_set (GtkWidget *widget,
- GtkStyle *prev_style)
-{
- GtkInfoBar *info_bar = GTK_INFO_BAR (widget);
- gint button_spacing;
- gint action_area_border;
- gint content_area_spacing;
- gint content_area_border;
-
- gtk_widget_style_get (widget,
- "button-spacing", &button_spacing,
- "action-area-border", &action_area_border,
- "content-area-spacing", &content_area_spacing,
- "content-area-border", &content_area_border,
- NULL);
-
- gtk_box_set_spacing (GTK_BOX (info_bar->priv->action_area), button_spacing);
- gtk_container_set_border_width (GTK_CONTAINER (info_bar->priv->action_area),
- action_area_border);
- gtk_box_set_spacing (GTK_BOX (info_bar->priv->content_area), content_area_spacing);
- gtk_container_set_border_width (GTK_CONTAINER (info_bar->priv->content_area),
- content_area_border);
-
- gtk_info_bar_update_colors (info_bar);
-}
-
static void
gtk_info_bar_init (GtkInfoBar *info_bar)
{
+ GtkWidget *widget = GTK_WIDGET (info_bar);
GtkWidget *content_area;
GtkWidget *action_area;
gtk_button_box_set_layout (GTK_BUTTON_BOX (action_area), GTK_BUTTONBOX_END);
gtk_box_pack_start (GTK_BOX (info_bar), action_area, FALSE, TRUE, 0);
- gtk_widget_set_app_paintable (GTK_WIDGET (info_bar), TRUE);
- gtk_widget_set_redraw_on_allocate (GTK_WIDGET (info_bar), TRUE);
+ gtk_widget_set_app_paintable (widget, TRUE);
+ gtk_widget_set_redraw_on_allocate (widget, TRUE);
info_bar->priv->content_area = content_area;
info_bar->priv->action_area = action_area;
+ /* set default spacings */
+ gtk_box_set_spacing (GTK_BOX (info_bar->priv->action_area), ACTION_AREA_DEFAULT_SPACING);
+ gtk_container_set_border_width (GTK_CONTAINER (info_bar->priv->action_area), ACTION_AREA_DEFAULT_BORDER);
+ gtk_box_set_spacing (GTK_BOX (info_bar->priv->content_area), CONTENT_AREA_DEFAULT_SPACING);
+ gtk_container_set_border_width (GTK_CONTAINER (info_bar->priv->content_area), CONTENT_AREA_DEFAULT_BORDER);
+
+ /* message-type is a CONSTRUCT property, so we init to a value
+ * different from its default to trigger its property setter
+ * during construction */
+ info_bar->priv->message_type = GTK_MESSAGE_OTHER;
+
gtk_widget_pop_composite_child ();
}
* to the end of the info bars's action area. The button widget is
* returned, but usually you don't need it.
*
- * Returns: (transfer none): the button widget that was added
+ * Returns: (transfer none): the #GtkButton widget that was added
*
* Since: 2.18
*/
{
ActionWidgetsSubParserData *parser_data;
- if (child)
- return FALSE;
+ if (parent_buildable_iface->custom_tag_start (buildable, builder, child,
+ tagname, parser, data))
+ return TRUE;
- if (strcmp (tagname, "action-widgets") == 0)
+ if (!child && strcmp (tagname, "action-widgets") == 0)
{
parser_data = g_slice_new0 (ActionWidgetsSubParserData);
parser_data->info_bar = GTK_INFO_BAR (buildable);
return TRUE;
}
- return parent_buildable_iface->custom_tag_start (buildable, builder, child,
- tagname, parser, data);
+ return FALSE;
}
static void
GtkMessageType message_type)
{
GtkInfoBarPrivate *priv;
- AtkObject *atk_obj;
g_return_if_fail (GTK_IS_INFO_BAR (info_bar));
if (priv->message_type != message_type)
{
+ GtkStyleContext *context;
+ AtkObject *atk_obj;
+ const char *type_class[] = {
+ GTK_STYLE_CLASS_INFO,
+ GTK_STYLE_CLASS_WARNING,
+ GTK_STYLE_CLASS_QUESTION,
+ GTK_STYLE_CLASS_ERROR,
+ NULL
+ };
+
+ context = gtk_widget_get_style_context (GTK_WIDGET (info_bar));
+
+ if (type_class[priv->message_type])
+ gtk_style_context_remove_class (context, type_class[priv->message_type]);
+
priv->message_type = message_type;
- gtk_info_bar_update_colors (info_bar);
gtk_widget_queue_draw (GTK_WIDGET (info_bar));
atk_obj = gtk_widget_get_accessible (GTK_WIDGET (info_bar));
}
}
+ if (type_class[priv->message_type])
+ gtk_style_context_add_class (context, type_class[priv->message_type]);
+
g_object_notify (G_OBJECT (info_bar), "message-type");
}
}
projects / ~andy / gtk / blobdiff