callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New private interface to help negotiate the default size of the widget.

Browse Source 
Fri Feb 27 18:46:27 2004  Jonathan Blandford  <jrb@redhat.com>

        * gtk/gtkfilechooserembed.h: New private interface to help
        negotiate the default size of the widget.  Still a bit buggy, but
        better than the old behavior.

        * gtk/gtkfilechooserdefault.c: Implement the embed interface.

        * gtk/gtkfilechooserwidget.c: Proxy the embed interface.

        * gtk/gtkfilechooserdialog.c: Use the embed interface.
This commit is contained in:
Jonathan Blandford
2004-02-27 23:51:16 +00:00
committed by Jonathan Blandford
parent c5fe469c82
commit 0cfdc7fb2b
12 changed files with 507 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
gtk/gtkfilechooserdialog.c
View File

@ -21,6 +21,7 @@
#include "gtkfilechooserdialog.h"
#include "gtkfilechooserwidget.h"
#include "gtkfilechooserutils.h"
#include "gtkfilechooserembed.h"
#include "gtkfilesystem.h"
#include "gtktypebuiltins.h"
@ -32,8 +33,12 @@
struct _GtkFileChooserDialogPrivate
{
GtkWidget *widget;
char *file_system;
/* for use with GtkFileChooserEmbed */
gint default_width;
gint default_height;
};
#define GTK_FILE_CHOOSER_DIALOG_GET_PRIVATE(o) (GTK_FILE_CHOOSER_DIALOG (o)->priv)
@ -54,11 +59,8 @@ static void gtk_file_chooser_dialog_get_property (GObject *obj
GValue *value,
GParamSpec *pspec);
static void gtk_file_chooser_dialog_realize (GtkWidget *widget);
static void gtk_file_chooser_dialog_style_set (GtkWidget *widget,
GtkStyle *previous_style);
static void gtk_file_chooser_dialog_screen_changed (GtkWidget *widget,
GdkScreen *previous_screen);
static GObjectClass *parent_class;
@ -112,9 +114,7 @@ gtk_file_chooser_dialog_class_init (GtkFileChooserDialogClass *class)
gobject_class->get_property = gtk_file_chooser_dialog_get_property;
gobject_class->finalize = gtk_file_chooser_dialog_finalize;
widget_class->realize = gtk_file_chooser_dialog_realize;
widget_class->style_set = gtk_file_chooser_dialog_style_set;
widget_class->screen_changed = gtk_file_chooser_dialog_screen_changed;
_gtk_file_chooser_install_properties (gobject_class);
@ -128,6 +128,8 @@ gtk_file_chooser_dialog_init (GtkFileChooserDialog *dialog)
GTK_TYPE_FILE_CHOOSER_DIALOG,
GtkFileChooserDialogPrivate);
dialog->priv = priv;
dialog->priv->default_width = -1;
dialog->priv->default_height = -1;
gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
}
@ -150,6 +152,52 @@ file_chooser_widget_file_activated (GtkFileChooser *chooser,
gtk_window_activate_default (GTK_WINDOW (dialog));
}
static void
file_chooser_widget_default_size_changed (GtkWidget *widget,
GtkFileChooserDialog *dialog)
{
GtkFileChooserDialogPrivate *priv;
gint extra_width;
gint extra_height;
gint width, height;
priv = GTK_FILE_CHOOSER_DIALOG_GET_PRIVATE (dialog);
/* Determine how much space the rest of the dialog uses compared to priv->widget */
extra_width = GTK_WIDGET (dialog)->requisition.width - priv->widget->requisition.width;
extra_height = GTK_WIDGET (dialog)->requisition.height - priv->widget->requisition.height;
_gtk_file_chooser_embed_get_default_size (GTK_FILE_CHOOSER_EMBED (priv->widget),
&width, &height);
width = extra_width + width;
height = extra_height + height;
/* g_print ("file_chooser_widget_default_size_changed: %d %d\n", width, height);*/
/* FIXME: We should make sure that we arent' bigger than the current screen */
if (GTK_WIDGET_REALIZED (dialog) &&
priv->default_width > 0 &&
priv->default_height > 0)
{
gint cur_width, cur_height;
gint dx, dy;
gtk_window_get_size (GTK_WINDOW (dialog), &cur_width, &cur_height);
dx = width - priv->default_width;
dy = height - priv->default_height;
gtk_window_resize (GTK_WINDOW (dialog),
cur_width + dx,
cur_height + dy);
}
else
{
gtk_window_set_default_size (GTK_WINDOW (dialog), width, height);
}
priv->default_width = width;
priv->default_height = height;
}
static GObject*
gtk_file_chooser_dialog_constructor (GType type,
guint n_construct_properties,
@ -174,6 +222,8 @@ gtk_file_chooser_dialog_constructor (GType type,
g_signal_connect (priv->widget, "file-activated",
G_CALLBACK (file_chooser_widget_file_activated), object);
g_signal_connect (priv->widget, "default-size-changed",
G_CALLBACK (file_chooser_widget_default_size_changed), object);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (object)->vbox), priv->widget, TRUE, TRUE, 0);
gtk_widget_show (priv->widget);
@ -267,13 +317,6 @@ set_default_size (GtkFileChooserDialog *dialog)
(default_height == -1) ? height : default_height);
}
static void
gtk_file_chooser_dialog_realize (GtkWidget *widget)
{
GTK_WIDGET_CLASS (parent_class)->realize (widget);
set_default_size (GTK_FILE_CHOOSER_DIALOG (widget));
}
static void
gtk_file_chooser_dialog_style_set (GtkWidget *widget,
GtkStyle *previous_style)
@ -283,9 +326,6 @@ gtk_file_chooser_dialog_style_set (GtkWidget *widget,
if (GTK_WIDGET_CLASS (parent_class)->style_set)
GTK_WIDGET_CLASS (parent_class)->style_set (widget, previous_style);
if (GTK_WIDGET_REALIZED (widget))
set_default_size (GTK_FILE_CHOOSER_DIALOG (widget));
dialog = GTK_DIALOG (widget);
/* Override the style properties with HIG-compliant spacings. Ugh.
@ -294,23 +334,12 @@ gtk_file_chooser_dialog_style_set (GtkWidget *widget,
*/
gtk_container_set_border_width (GTK_CONTAINER (dialog->vbox), 12);
gtk_box_set_spacing (GTK_BOX (dialog->vbox), 24);
gtk_box_set_spacing (GTK_BOX (dialog->vbox), 12);
gtk_container_set_border_width (GTK_CONTAINER (dialog->action_area), 0);
gtk_box_set_spacing (GTK_BOX (dialog->action_area), 6);
}
static void
gtk_file_chooser_dialog_screen_changed (GtkWidget *widget,
GdkScreen *previous_screen)
{
if (GTK_WIDGET_CLASS (parent_class)->screen_changed)
GTK_WIDGET_CLASS (parent_class)->screen_changed (widget, previous_screen);
if (GTK_WIDGET_REALIZED (widget))
set_default_size (GTK_FILE_CHOOSER_DIALOG (widget));
}
static GtkWidget *
gtk_file_chooser_dialog_new_valist (const gchar *title,
GtkWindow *parent,