summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--src/list.c5
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b8ee1f4..d22578f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-01-26 shawn <sabetts@vcn.bc.ca>
+
+ * src/list.c (set_active_window): Corrected a bug in determining
+ what a maxsize window is. Only one of width or height must be less
+ than the screen width or height for a window to qualify as a
+ maxsize window.
+
2002-01-24 shawn <sabetts@vcn.bc.ca>
* src/actions.c (cmd_defbarloc): Read the location argument as a
diff --git a/src/list.c b/src/list.c
index d85ebdf..30e0325 100644
--- a/src/list.c
+++ b/src/list.c
@@ -564,6 +564,7 @@ is_transient_ancestor (rp_window *win, rp_window *transient_for)
}
#endif
+/* In the current frame, set the active window to win. win will have focus. */
void
set_active_window (rp_window *win)
{
@@ -583,8 +584,8 @@ set_active_window (rp_window *win)
#ifdef MAXSIZE_WINDOWS_ARE_TRANSIENTS
if (!win->transient
&& !(win->hints->flags & PMaxSize
- && win->hints->max_width < win->scr->root_attr.width
- && win->hints->max_height < win->scr->root_attr.height))
+ && (win->hints->max_width < win->scr->root_attr.width
+ || win->hints->max_height < win->scr->root_attr.height)))
#else
if (!win->transient)
#endif