feat: The floating Windows do not overlap
This commit is contained in:
24
src/mango.c
24
src/mango.c
@@ -700,6 +700,7 @@ static bool check_trackpad_disabled(struct wlr_pointer *pointer);
|
|||||||
static unsigned int get_tag_status(unsigned int tag, Monitor *m);
|
static unsigned int get_tag_status(unsigned int tag, Monitor *m);
|
||||||
static void enable_adaptive_sync(Monitor *m, struct wlr_output_state *state);
|
static void enable_adaptive_sync(Monitor *m, struct wlr_output_state *state);
|
||||||
static Client *get_next_stack_client(Client *c, bool reverse);
|
static Client *get_next_stack_client(Client *c, bool reverse);
|
||||||
|
static void set_float_malposition(Client *tc);
|
||||||
|
|
||||||
#include "data/static_keymap.h"
|
#include "data/static_keymap.h"
|
||||||
#include "dispatch/bind_declare.h"
|
#include "dispatch/bind_declare.h"
|
||||||
@@ -1179,6 +1180,25 @@ int applyrulesgeom(Client *c) {
|
|||||||
return hit;
|
return hit;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void set_float_malposition(Client *tc) {
|
||||||
|
Client *c = NULL;
|
||||||
|
int x, y, offset;
|
||||||
|
x = tc->geom.x;
|
||||||
|
y = tc->geom.y;
|
||||||
|
offset = MIN(tc->mon->m.width / 20, tc->mon->m.height / 20);
|
||||||
|
|
||||||
|
wl_list_for_each(c, &clients, link) {
|
||||||
|
if (c->isfloating && c != tc && VISIBLEON(c, tc->mon) &&
|
||||||
|
x - c->geom.x < offset && y - c->geom.y < offset) {
|
||||||
|
x = c->geom.x + offset;
|
||||||
|
y = c->geom.y + offset;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
tc->float_geom.x = tc->geom.x = x;
|
||||||
|
tc->float_geom.y = tc->geom.y = y;
|
||||||
|
}
|
||||||
|
|
||||||
void applyrules(Client *c) {
|
void applyrules(Client *c) {
|
||||||
/* rule matching */
|
/* rule matching */
|
||||||
const char *appid, *title;
|
const char *appid, *title;
|
||||||
@@ -1298,6 +1318,10 @@ void applyrules(Client *c) {
|
|||||||
arrange(c->mon, false);
|
arrange(c->mon, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (c->isfloating && !hit_rule_pos) {
|
||||||
|
set_float_malposition(c);
|
||||||
|
}
|
||||||
|
|
||||||
// apply named scratchpad rule
|
// apply named scratchpad rule
|
||||||
if (c->isnamedscratchpad) {
|
if (c->isnamedscratchpad) {
|
||||||
apply_named_scratchpad(c);
|
apply_named_scratchpad(c);
|
||||||
|
|||||||
Reference in New Issue
Block a user