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

get the logic correct. This will fix sizing on save dialogs.

Browse Source 
Tue Mar  2 15:03:15 2004  Jonathan Blandford  <jrb@redhat.com>

        * gtk/gtkfilechooserdefault.c
        (gtk_file_chooser_default_get_resizable_hints): get the logic
        correct.  This will fix sizing on save dialogs.

        (save_widgets_create): set_mnemonic_widget.
This commit is contained in:
Jonathan Blandford
2004-03-02 20:09:20 +00:00
committed by Jonathan Blandford
parent 9133c58b8d
commit 87a6680f33
7 changed files with 50 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Tue Mar 2 15:03:15 2004 Jonathan Blandford <jrb@redhat.com>
* gtk/gtkfilechooserdefault.c
(gtk_file_chooser_default_get_resizable_hints): get the logic
correct. This will fix sizing on save dialogs.
(save_widgets_create): set_mnemonic_widget.
2004-03-02 Federico Mena Quintero <federico@ximian.com> 2004-03-02 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkfilechooserdefault.c * gtk/gtkfilechooserdefault.c

8
ChangeLog.pre-2-10
View File

@ -1,3 +1,11 @@
Tue Mar 2 15:03:15 2004 Jonathan Blandford <jrb@redhat.com>
* gtk/gtkfilechooserdefault.c
(gtk_file_chooser_default_get_resizable_hints): get the logic
correct. This will fix sizing on save dialogs.
(save_widgets_create): set_mnemonic_widget.
2004-03-02 Federico Mena Quintero <federico@ximian.com> 2004-03-02 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkfilechooserdefault.c * gtk/gtkfilechooserdefault.c

8
ChangeLog.pre-2-4
View File

@ -1,3 +1,11 @@
Tue Mar 2 15:03:15 2004 Jonathan Blandford <jrb@redhat.com>
* gtk/gtkfilechooserdefault.c
(gtk_file_chooser_default_get_resizable_hints): get the logic
correct. This will fix sizing on save dialogs.
(save_widgets_create): set_mnemonic_widget.
2004-03-02 Federico Mena Quintero <federico@ximian.com> 2004-03-02 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkfilechooserdefault.c * gtk/gtkfilechooserdefault.c

8
ChangeLog.pre-2-6
View File

@ -1,3 +1,11 @@
Tue Mar 2 15:03:15 2004 Jonathan Blandford <jrb@redhat.com>
* gtk/gtkfilechooserdefault.c
(gtk_file_chooser_default_get_resizable_hints): get the logic
correct. This will fix sizing on save dialogs.
(save_widgets_create): set_mnemonic_widget.
2004-03-02 Federico Mena Quintero <federico@ximian.com> 2004-03-02 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkfilechooserdefault.c * gtk/gtkfilechooserdefault.c

8
ChangeLog.pre-2-8
View File

@ -1,3 +1,11 @@
Tue Mar 2 15:03:15 2004 Jonathan Blandford <jrb@redhat.com>
* gtk/gtkfilechooserdefault.c
(gtk_file_chooser_default_get_resizable_hints): get the logic
correct. This will fix sizing on save dialogs.
(save_widgets_create): set_mnemonic_widget.
2004-03-02 Federico Mena Quintero <federico@ximian.com> 2004-03-02 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkfilechooserdefault.c * gtk/gtkfilechooserdefault.c

22
gtk/gtkfilechooserdefault.c
View File

@ -2076,6 +2076,7 @@ save_widgets_create (GtkFileChooserDefault *impl)
1, 2, 1, 2, 1, 2, 1, 2,
GTK_EXPAND | GTK_FILL, GTK_FILL, GTK_EXPAND | GTK_FILL, GTK_FILL,
0, 0); 0, 0);
gtk_label_set_mnemonic_widget (GTK_LABEL (impl->save_folder_label), impl->save_folder_combo);
/* custom widget */ /* custom widget */
impl->save_extra_align = gtk_alignment_new (0.0, 0.5, 1.0, 1.0); impl->save_extra_align = gtk_alignment_new (0.0, 0.5, 1.0, 1.0);
@ -3359,23 +3360,18 @@ gtk_file_chooser_default_get_resizable_hints (GtkFileChooserEmbed *chooser_embed
{ {
GtkFileChooserDefault *impl; GtkFileChooserDefault *impl;
g_return_if_fail (resize_horizontally != NULL);
g_return_if_fail (resize_vertically != NULL);
impl = GTK_FILE_CHOOSER_DEFAULT (chooser_embed); impl = GTK_FILE_CHOOSER_DEFAULT (chooser_embed);
if (resize_horizontally) if (impl->action == GTK_FILE_CHOOSER_ACTION_SAVE ||
*resize_horizontally = TRUE; impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
if (resize_vertically)
{ {
*resize_vertically = TRUE; if (! gtk_expander_get_expanded (GTK_EXPANDER (impl->save_expander)))
if (impl->action == GTK_FILE_CHOOSER_ACTION_SAVE ||
impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
{ {
if (! gtk_expander_get_expanded (GTK_EXPANDER (impl->save_expander))) *resize_vertically = FALSE;
{ *resize_horizontally = FALSE;
*resize_vertically = FALSE;
*resize_horizontally = FALSE;
}
} }
} }
} }

1
gtk/gtkfilechooserdialog.c
View File

@ -227,6 +227,7 @@ file_chooser_widget_default_size_changed (GtkWidget *widget,
_gtk_file_chooser_embed_get_resizable_hints (GTK_FILE_CHOOSER_EMBED (priv->widget), _gtk_file_chooser_embed_get_resizable_hints (GTK_FILE_CHOOSER_EMBED (priv->widget),
&resize_horizontally, &resize_horizontally,
&resize_vertically); &resize_vertically);
/* Only store the size if we can resize in that direction. */ /* Only store the size if we can resize in that direction. */
if (resize_horizontally) if (resize_horizontally)
priv->default_width = width; priv->default_width = width;