Changeset 908de44

Timestamp:

Jun 1, 2010, 12:10:44 PM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

84a4aca

Parents:

a57f87a

Message:

Export owl_mainpanel_relayout

Also, temporarily schedule a relayout.

File:

• mainpanel.c (modified) (4 diffs)

mainpanel.c

@@ -2 +2 @@
 
 static void owl_mainpanel_size(owl_window *parent, void *user_data);
-static void owl_mainpanel_layout_contents(owl_window *parent, void *user_data);
 
 void owl_mainpanel_init(owl_mainpanel *mp)
@@ -15 +14 @@
   /* Set up sizing hooks */
   owl_signal_connect_object(owl_window_get_screen(), "resized", G_CALLBACK(owl_mainpanel_size), mp->panel, 0);
-  g_signal_connect(mp->panel, "resized", G_CALLBACK(owl_mainpanel_layout_contents), mp);
+  g_signal_connect_swapped(mp->panel, "resized", G_CALLBACK(owl_mainpanel_layout_contents), mp);
 
   /* Bootstrap the sizes and go */
@@ -32 +31 @@
 }
 
-static void owl_mainpanel_layout_contents(owl_window *panel, void *user_data)
+void owl_mainpanel_layout_contents(owl_mainpanel *mp)
 {
   int lines, cols, typwin_lines;
-  owl_mainpanel *mp = user_data;
 
-  owl_window_get_position(panel, &lines, &cols, NULL, NULL);
+  /* skip if we haven't been initialized */
+  if (!mp->panel) return;
+
+  owl_window_get_position(mp->panel, &lines, &cols, NULL, NULL);
   typwin_lines = owl_global_get_typwin_lines(&g);
 
@@ -52 +53 @@
   owl_window_set_position(mp->msgwin, 1, cols, mp->recwinlines+1, 0);
   owl_window_set_position(mp->typwin, typwin_lines, cols, mp->recwinlines+2, 0);
+
+  /* TEMPORARY */
+  owl_global_set_relayout_pending(&g);
 }