mirror of
https://github.com/DreamMaoMao/maomaowm.git
synced 2025-10-29 05:40:21 -04:00
rollback: remove force_tile_state option
Since the non-tiled state can cause the size of some Windows to be out of sync with the synthesizer's expectations, all Windows are set to the tiled state by default again
This commit is contained in:
parent
a839771ddf
commit
9941bf9752
3 changed files with 5 additions and 33 deletions
|
|
@ -356,9 +356,7 @@ static inline void client_set_tiled(Client *c, uint32_t edges) {
|
|||
|
||||
if (wl_resource_get_version(c->surface.xdg->toplevel->resource) >=
|
||||
XDG_TOPLEVEL_STATE_TILED_RIGHT_SINCE_VERSION) {
|
||||
wlr_xdg_toplevel_set_tiled(c->surface.xdg->toplevel,
|
||||
WLR_EDGE_TOP | WLR_EDGE_BOTTOM |
|
||||
WLR_EDGE_LEFT | WLR_EDGE_RIGHT);
|
||||
wlr_xdg_toplevel_set_tiled(c->surface.xdg->toplevel, edges);
|
||||
}
|
||||
|
||||
if (!c->ignore_maximize) {
|
||||
|
|
|
|||
|
|
@ -72,7 +72,6 @@ typedef struct {
|
|||
int no_force_center;
|
||||
int isterm;
|
||||
int allow_csd;
|
||||
int force_tile_state;
|
||||
int noswallow;
|
||||
int noblur;
|
||||
float focused_opacity;
|
||||
|
|
@ -1547,7 +1546,6 @@ void parse_option(Config *config, char *key, char *value) {
|
|||
rule->isnosizehint = -1;
|
||||
rule->isterm = -1;
|
||||
rule->allow_csd = -1;
|
||||
rule->force_tile_state = -1;
|
||||
rule->noswallow = -1;
|
||||
rule->noblur = -1;
|
||||
rule->nofadein = -1;
|
||||
|
|
@ -1642,8 +1640,6 @@ void parse_option(Config *config, char *key, char *value) {
|
|||
rule->isterm = atoi(val);
|
||||
} else if (strcmp(key, "allow_csd") == 0) {
|
||||
rule->allow_csd = atoi(val);
|
||||
} else if (strcmp(key, "force_tile_state") == 0) {
|
||||
rule->force_tile_state = atoi(val);
|
||||
} else if (strcmp(key, "noswallow") == 0) {
|
||||
rule->noswallow = atoi(val);
|
||||
} else if (strcmp(key, "noblur") == 0) {
|
||||
|
|
|
|||
22
src/mango.c
22
src/mango.c
|
|
@ -325,7 +325,6 @@ struct Client {
|
|||
struct dwl_animation animation;
|
||||
int isterm, noswallow;
|
||||
int allow_csd;
|
||||
int force_tile_state;
|
||||
pid_t pid;
|
||||
Client *swallowing, *swallowedby;
|
||||
bool is_clip_to_hide;
|
||||
|
|
@ -1131,7 +1130,6 @@ void toggle_hotarea(int x_root, int y_root) {
|
|||
static void apply_rule_properties(Client *c, const ConfigWinRule *r) {
|
||||
APPLY_INT_PROP(c, r, isterm);
|
||||
APPLY_INT_PROP(c, r, allow_csd);
|
||||
APPLY_INT_PROP(c, r, force_tile_state);
|
||||
APPLY_INT_PROP(c, r, noswallow);
|
||||
APPLY_INT_PROP(c, r, nofadein);
|
||||
APPLY_INT_PROP(c, r, nofadeout);
|
||||
|
|
@ -2260,7 +2258,6 @@ void commitnotify(struct wl_listener *listener, void *data) {
|
|||
setmon(c, NULL, 0,
|
||||
true); /* Make sure to reapply rules in mapnotify() */
|
||||
|
||||
if (c->force_tile_state)
|
||||
client_set_tiled(c, WLR_EDGE_TOP | WLR_EDGE_BOTTOM | WLR_EDGE_LEFT |
|
||||
WLR_EDGE_RIGHT);
|
||||
|
||||
|
|
@ -3524,7 +3521,6 @@ void init_client_properties(Client *c) {
|
|||
c->stack_innder_per = 0.0f;
|
||||
c->isterm = 0;
|
||||
c->allow_csd = 0;
|
||||
c->force_tile_state = 1;
|
||||
}
|
||||
|
||||
void // old fix to 0.5
|
||||
|
|
@ -3632,7 +3628,6 @@ mapnotify(struct wl_listener *listener, void *data) {
|
|||
applyrules(c);
|
||||
}
|
||||
|
||||
if (c->force_tile_state)
|
||||
client_set_tiled(c, WLR_EDGE_TOP | WLR_EDGE_BOTTOM | WLR_EDGE_LEFT |
|
||||
WLR_EDGE_RIGHT);
|
||||
|
||||
|
|
@ -4422,15 +4417,6 @@ setfloating(Client *c, int floating) {
|
|||
set_size_per(c->mon, c);
|
||||
}
|
||||
|
||||
if (!c->force_tile_state) {
|
||||
if (c->isfloating) {
|
||||
client_set_tiled(c, WLR_EDGE_NONE);
|
||||
} else {
|
||||
client_set_tiled(c, WLR_EDGE_TOP | WLR_EDGE_BOTTOM | WLR_EDGE_LEFT |
|
||||
WLR_EDGE_RIGHT);
|
||||
}
|
||||
}
|
||||
|
||||
arrange(c->mon, false);
|
||||
setborder_color(c);
|
||||
printstatus();
|
||||
|
|
@ -4484,14 +4470,6 @@ void setmaxmizescreen(Client *c, int maxmizescreen) {
|
|||
set_size_per(c->mon, c);
|
||||
}
|
||||
|
||||
if (!c->ismaxmizescreen && !c->force_tile_state && c->isfloating) {
|
||||
client_set_tiled(c, WLR_EDGE_NONE);
|
||||
|
||||
} else {
|
||||
client_set_tiled(c, WLR_EDGE_TOP | WLR_EDGE_BOTTOM | WLR_EDGE_LEFT |
|
||||
WLR_EDGE_RIGHT);
|
||||
}
|
||||
|
||||
arrange(c->mon, false);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue