Revision: 4782 http://geany.svn.sourceforge.net/geany/?rev=4782&view=rev Author: eht16 Date: 2010-03-20 16:20:55 +0000 (Sat, 20 Mar 2010)
Log Message: ----------- Deprecate GEANY_WINDOW_MINIMAL_WIDTH/GEANY_WINDOW_MINIMAL_HEIGHT to not set Geany's minimum window size anymore (closes #2972992). As replacement, add GEANY_DEFAULT_DIALOG_HEIGHT.
Modified Paths: -------------- trunk/ChangeLog trunk/plugins/htmlchars.c trunk/src/geany.h trunk/src/keybindings.c trunk/src/main.c trunk/src/plugindata.h
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-03-20 15:40:45 UTC (rev 4781) +++ trunk/ChangeLog 2010-03-20 16:20:55 UTC (rev 4782) @@ -9,6 +9,11 @@ * scintilla/ScintillaGTK.cxx: Backport fix from Scintilla CVS to not paste text beyond the end of lines (closes #2969096). + * plugins/htmlchars.c, src/geany.h, src/keybindings.c, src/main.c, + src/plugindata.h: + Deprecate GEANY_WINDOW_MINIMAL_WIDTH/GEANY_WINDOW_MINIMAL_HEIGHT + to not set Geany's minimum window size anymore (closes #2972992). + As replacement, add GEANY_DEFAULT_DIALOG_HEIGHT.
2010-03-19 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/plugins/htmlchars.c =================================================================== --- trunk/plugins/htmlchars.c 2010-03-20 15:40:45 UTC (rev 4781) +++ trunk/plugins/htmlchars.c 2010-03-20 16:20:55 UTC (rev 4782) @@ -453,7 +453,7 @@ gtk_box_set_spacing(GTK_BOX(vbox), 6); gtk_widget_set_name(sc_dialog, "GeanyDialog");
- height = GEANY_WINDOW_MINIMAL_HEIGHT; + height = GEANY_DEFAULT_DIALOG_HEIGHT; gtk_window_set_default_size(GTK_WINDOW(sc_dialog), height * 8 / 10, height); gtk_dialog_set_default_response(GTK_DIALOG(sc_dialog), GTK_RESPONSE_CANCEL);
Modified: trunk/src/geany.h =================================================================== --- trunk/src/geany.h 2010-03-20 15:40:45 UTC (rev 4781) +++ trunk/src/geany.h 2010-03-20 16:20:55 UTC (rev 4782) @@ -51,12 +51,12 @@ #define GEANY_HOMEPAGE "http://www.geany.org/" #define GEANY_USE_WIN32_DIALOG 0 #define GEANY_STRING_UNTITLED _("untitled") -#define GEANY_WINDOW_MINIMAL_WIDTH 550 -#define GEANY_WINDOW_MINIMAL_HEIGHT 350 +#define GEANY_DEFAULT_DIALOG_HEIGHT 350 #define GEANY_WINDOW_DEFAULT_WIDTH 900 #define GEANY_WINDOW_DEFAULT_HEIGHT 600
+ /* Common forward declarations */ typedef struct GeanyDocument GeanyDocument; typedef struct GeanyEditor GeanyEditor;
Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2010-03-20 15:40:45 UTC (rev 4781) +++ trunk/src/keybindings.c 2010-03-20 16:20:55 UTC (rev 4782) @@ -843,7 +843,6 @@ GtkWidget *dialog, *tree, *label, *swin, *vbox; GtkCellRenderer *text_renderer; GtkTreeViewColumn *column; - gint height;
dialog = gtk_dialog_new_with_buttons(_("Keyboard Shortcuts"), GTK_WINDOW(main_widgets.window), GTK_DIALOG_DESTROY_WITH_PARENT, @@ -853,8 +852,7 @@ gtk_box_set_spacing(GTK_BOX(vbox), 6); gtk_widget_set_name(dialog, "GeanyDialog");
- height = GEANY_WINDOW_MINIMAL_HEIGHT; - gtk_window_set_default_size(GTK_WINDOW(dialog), -1, height); + gtk_window_set_default_size(GTK_WINDOW(dialog), -1, GEANY_DEFAULT_DIALOG_HEIGHT);
gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CANCEL);
Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2010-03-20 15:40:45 UTC (rev 4781) +++ trunk/src/main.c 2010-03-20 16:20:55 UTC (rev 4782) @@ -265,6 +265,12 @@ /* hide Page setup menu item, it isn't supported with non-GTK printing */ gtk_widget_hide(ui_widgets.print_page_setup); #endif + + /* for some reason we need to set the initial size request, + * otherwise the main window gets crazy dimensions */ + gtk_widget_set_size_request(main_widgets.window, 10, 10); + gtk_window_set_default_size(GTK_WINDOW(main_widgets.window), + GEANY_WINDOW_DEFAULT_WIDTH, GEANY_WINDOW_DEFAULT_HEIGHT); }
@@ -968,8 +974,6 @@
/* inits */ main_init(); - gtk_widget_set_size_request(main_widgets.window, GEANY_WINDOW_MINIMAL_WIDTH, GEANY_WINDOW_MINIMAL_HEIGHT); - gtk_window_set_default_size(GTK_WINDOW(main_widgets.window), GEANY_WINDOW_DEFAULT_WIDTH, GEANY_WINDOW_DEFAULT_HEIGHT);
encodings_init(); editor_init();
Modified: trunk/src/plugindata.h =================================================================== --- trunk/src/plugindata.h 2010-03-20 15:40:45 UTC (rev 4781) +++ trunk/src/plugindata.h 2010-03-20 16:20:55 UTC (rev 4782) @@ -50,7 +50,7 @@ enum { /** The Application Programming Interface (API) version, incremented * whenever any plugin data types are modified or appended to. */ - GEANY_API_VERSION = 177, + GEANY_API_VERSION = 178,
/** The Application Binary Interface (ABI) version, incremented whenever * existing fields in the plugin data types have to be changed or reordered. */ @@ -601,6 +601,9 @@ #define DOC_IDX_VALID(doc_idx) \ ((doc_idx) >= 0 && (guint)(doc_idx) < documents_array->len && documents[doc_idx]->is_valid)
+#define GEANY_WINDOW_MINIMAL_WIDTH 550 +#define GEANY_WINDOW_MINIMAL_HEIGHT GEANY_DEFAULT_DIALOG_HEIGHT + #endif /* GEANY_DISABLE_DEPRECATED */
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.