Changeset 402ed3d3

Timestamp:

Jun 1, 2010, 12:25:27 AM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.7, release-1.8, release-1.9

Children:

3da1f4f

Parents:

50031f0

git-author:

David Benjamin <davidben@mit.edu> (06/01/10 00:16:33)

git-committer:

David Benjamin <davidben@mit.edu> (06/01/10 00:25:27)

Message:

Use two functions: show/show_all instead of recurse flag

It's more readable, and matches GTK.

Files:

• popwin.c (modified) (1 diff)
• window.c (modified) (3 diffs)
• window.h (modified) (1 diff)

popwin.c

@@ -14 +14 @@
   owl_window_set_size_cb(pw->border, owl_popwin_size_border, 0, 0);
   owl_window_set_size_cb(pw->content, owl_popwin_size_content, 0, 0);
-  owl_window_show(pw->border, 1);
+  owl_window_show_all(pw->border);
 
   pw->active=1;

window.c

@@ -73 +73 @@
     screen->is_screen = 1;
     owl_window_set_size_cb(screen, _screen_calculate_size, &g, 0);
-    owl_window_show(screen, 0);
+    owl_window_show(screen);
   }
   return screen;
@@ -271 +271 @@
 }
 
-static void _map_recurse_curry(owl_window *w)
-{
-  owl_window_show(w, 1);
-}
-
-void owl_window_show(owl_window *w, int recurse)
+void owl_window_show(owl_window *w)
 {
   w->shown = 1;
@@ -282 +277 @@
   if (w->pan)
     show_panel(w->pan);
-  if (recurse)
-    owl_window_children_foreach_onearg(w, _map_recurse_curry);
+}
+
+void owl_window_show_all(owl_window *w)
+{
+  owl_window_show(w);
+  owl_window_children_foreach_onearg(w, owl_window_show);
 }
 

window.h

@@ -19 +19 @@
 owl_window *owl_window_get_parent(owl_window *w);
 
-void owl_window_show(owl_window *w, int recurse);
+void owl_window_show(owl_window *w);
+void owl_window_show_all(owl_window *w);
 void owl_window_hide(owl_window *w);
 int owl_window_is_shown(owl_window *w);