[gnome-nibbles] Revert "No more resizing (temporaily) per bug 709595"
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-nibbles] Revert "No more resizing (temporaily) per bug 709595"
- Date: Mon, 12 May 2014 15:12:16 +0000 (UTC)
commit cb0f6584d5964d970d7c42b0db714a78a58e6c7d
Author: Michael Catanzaro <mcatanzaro gnome org>
Date: Sun May 11 10:47:30 2014 -0500
Revert "No more resizing (temporaily) per bug 709595"
This reverts commit cd19ab057c0310ff3726dfb1cde50de1acef5581.
src/main.c | 4 ++--
src/properties.c | 6 ++----
2 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/src/main.c b/src/main.c
index d93826b..2cf5c40 100644
--- a/src/main.c
+++ b/src/main.c
@@ -585,7 +585,7 @@ activate (GtkApplication* app,
GtkWidget *headerbar;
GtkWidget *label;
GdkGeometry size_hints = {
- 1024, 768, 0, 0, 1024, 768, 0, 0, 0.0, 0.0, GDK_GRAVITY_NORTH_WEST
+ 800, 600, 0, 0, 800, 600, 0, 0, 0.0, 0.0, GDK_GRAVITY_NORTH_WEST
};
GtkWidget *vbox;
@@ -607,7 +607,7 @@ activate (GtkApplication* app,
gtk_window_set_geometry_hints (GTK_WINDOW (window),
window,
&size_hints,
- GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE);
+ GDK_HINT_MIN_SIZE);
g_action_map_add_action_entries (G_ACTION_MAP (app), app_entries, G_N_ELEMENTS (app_entries), app);
diff --git a/src/properties.c b/src/properties.c
index 72fb08a..33f853e 100644
--- a/src/properties.c
+++ b/src/properties.c
@@ -118,12 +118,10 @@ gnibbles_properties_update (GnibblesProperties * tmp)
sound_enable (tmp->sound);
tmp->tilesize = g_settings_get_int (settings, "tile-size");
- //Set to only one size, see bug 709595
- tmp->tilesize = 10;
- /*if (tmp->tilesize < 8)
+ if (tmp->tilesize < 8)
tmp->tilesize = 8;
if (tmp->tilesize > 30)
- tmp->tilesize = 30;*/
+ tmp->tilesize = 30;
for (i = 0; i < NUMWORMS; i++) {
tmp->wormprops[i] = g_slice_new0 (GnibblesWormProps);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]