Changeset 52172cc

Timestamp:

Sep 30, 2010, 8:07:17 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:

58a16cc

Parents:

e75a6df

git-author:

David Benjamin <davidben@mit.edu> (09/29/10 14:04:30)

git-committer:

David Benjamin <davidben@mit.edu> (09/30/10 20:07:17)

Message:

Update the editwin's fillcol and wrapcol on resize

Otherwise resizing the window during the lifetime of an editwin will not
pick up changes.

File:

• editwin.c (modified) (2 diffs)

editwin.c

@@ -170 +170 @@
 }
 
-static void oe_window_resized(owl_window *w, owl_editwin *e)
-{
-  /* update the sizes */
-  owl_window_get_position(w, &e->winlines, &e->wincols, NULL, NULL);
-}
-
-static void oe_set_window(owl_editwin *e, owl_window *w, int winlines, int wincols)
-{
-  e->win=w;
+/* TODO: collapse this window into oe_window_resized. Need to stop
+ * passing winlines and wincols to oe_set_window and get them out of
+ * the owl_window. The tester code will first need to pass in an
+ * owl_window headless or so. */
+static void oe_set_window_size(owl_editwin *e, int winlines, int wincols)
+{
   e->winlines=winlines;
   e->wincols=wincols;
+  /* fillcol and wrapcol may have changed. */
   e->fillcol=owl_editwin_limit_maxcols(wincols-7, owl_global_get_edit_maxfillcols(&g));
   if (e->style == OWL_EDITWIN_STYLE_MULTILINE)
@@ -186 +184 @@
   else
     e->wrapcol = 0;
+}
+
+static void oe_window_resized(owl_window *w, owl_editwin *e)
+{
+  int winlines, wincols;
+  owl_window_get_position(w, &winlines, &wincols, NULL, NULL);
+  oe_set_window_size(e, winlines, wincols);
+}
+
+static void oe_set_window(owl_editwin *e, owl_window *w, int winlines, int wincols)
+{
+  e->win=w;
+  oe_set_window_size(e, winlines, wincols);
   if (e->win) {
     g_object_ref(e->win);