]> git.lizzy.rs Git - bspwm.git/commitdiff
Merge into existing monitors when rectangles are equal
authorBastien Dejean <nihilhill@gmail.com>
Mon, 5 May 2014 18:48:45 +0000 (20:48 +0200)
committerBastien Dejean <nihilhill@gmail.com>
Mon, 5 May 2014 18:48:45 +0000 (20:48 +0200)
monitor.c

index 5162d5a82eeff42a24d7a77401b782e7a6f98be0..551ac55c89052d9798b035ca8fae188267d841af 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -403,8 +403,13 @@ bool update_monitors(void)
                                                        contains(mb->rectangle, m->rectangle)) {
                                                if (mm == m)
                                                        mm = mb;
-                                               merge_monitors(m, mb);
-                                               remove_monitor(m);
+                                               if (m->desk != NULL && mb->desk == NULL && contains(m->rectangle, mb->rectangle)) {
+                                                       mm = m;
+                                                       remove_monitor(mb);
+                                               } else {
+                                                       merge_monitors(m, mb);
+                                                       remove_monitor(m);
+                                               }
                                                break;
                                        }
                        }