rasmusq/mangowc-rasmusq
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: nmaster num caculate error in master layout

Browse Source
This commit is contained in:
DreamMaoMao
2025-12-07 21:12:45 +08:00
parent 1e8e4677dd
commit f3f3215791
4 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/fetch/client.h
View File

@@ -349,7 +349,7 @@ Client *find_client_by_direction(Client *tc, const Arg *arg, bool findfloating,
} }
free(tempClients); // 释放内存 free(tempClients); // 释放内存
if(tempSameMonitorFocusClients) { if (tempSameMonitorFocusClients) {
return tempSameMonitorFocusClients; return tempSameMonitorFocusClients;
} else { } else {
return tempFocusClients; return tempFocusClients;

18
src/layout/arrange.h
View File

@@ -516,17 +516,15 @@ void reset_size_per_mon(Monitor *m, int tile_cilent_num,
wl_list_for_each(c, &clients, link) { wl_list_for_each(c, &clients, link) {
if (VISIBLEON(c, m) && ISTILED(c)) { if (VISIBLEON(c, m) && ISTILED(c)) {
if (total_master_inner_percent > 0.0 && i < nmasters) {
if (total_master_inner_percent <= 0.0)
return;
if (i < m->pertag->nmasters[m->pertag->curtag]) {
c->ismaster = true; c->ismaster = true;
c->stack_innder_per = stack_num ? 1.0f / stack_num : 1.0f; c->stack_innder_per = stack_num ? 1.0f / stack_num : 1.0f;
c->master_inner_per = c->master_inner_per =
c->master_inner_per / total_master_inner_percent; c->master_inner_per / total_master_inner_percent;
} else { } else {
c->ismaster = false; c->ismaster = false;
c->master_inner_per = 1.0f / master_num; c->master_inner_per =
master_num > 0 ? 1.0f / master_num : 1.0f;
c->stack_innder_per = c->stack_innder_per =
total_stack_hight_percent total_stack_hight_percent
? c->stack_innder_per / total_stack_hight_percent ? c->stack_innder_per / total_stack_hight_percent
@@ -538,10 +536,7 @@ void reset_size_per_mon(Monitor *m, int tile_cilent_num,
} else { } else {
wl_list_for_each(c, &clients, link) { wl_list_for_each(c, &clients, link) {
if (VISIBLEON(c, m) && ISTILED(c)) { if (VISIBLEON(c, m) && ISTILED(c)) {
if (total_master_inner_percent > 0.0 && i < nmasters) {
if (total_master_inner_percent <= 0.0)
return;
if (i < m->pertag->nmasters[m->pertag->curtag]) {
c->ismaster = true; c->ismaster = true;
if ((stack_index % 2) ^ (tile_cilent_num % 2 == 0)) { if ((stack_index % 2) ^ (tile_cilent_num % 2 == 0)) {
c->stack_innder_per = c->stack_innder_per =
@@ -558,7 +553,8 @@ void reset_size_per_mon(Monitor *m, int tile_cilent_num,
stack_index = i - nmasters; stack_index = i - nmasters;
c->ismaster = false; c->ismaster = false;
c->master_inner_per = 1.0f / master_num; c->master_inner_per =
master_num > 0 ? 1.0f / master_num : 1.0f;
if ((stack_index % 2) ^ (tile_cilent_num % 2 == 0)) { if ((stack_index % 2) ^ (tile_cilent_num % 2 == 0)) {
c->stack_innder_per = c->stack_innder_per =
total_right_stack_hight_percent total_right_stack_hight_percent
@@ -637,7 +633,7 @@ arrange(Monitor *m, bool want_animation) {
if (VISIBLEON(c, m)) { if (VISIBLEON(c, m)) {
if (ISTILED(c)) { if (ISTILED(c)) {
if (i < m->pertag->nmasters[m->pertag->curtag]) { if (i < nmasters) {
master_num++; master_num++;
total_master_inner_percent += c->master_inner_per; total_master_inner_percent += c->master_inner_per;
} else { } else {

4
src/layout/horizontal.h
View File

@@ -386,6 +386,8 @@ void center_tile(Monitor *m) {
n = m->visible_tiling_clients; n = m->visible_tiling_clients;
master_num = m->pertag->nmasters[m->pertag->curtag]; master_num = m->pertag->nmasters[m->pertag->curtag];
master_num = n > master_num ? master_num : n;
stack_num = n - master_num; stack_num = n - master_num;
if (n == 0) if (n == 0)
@@ -595,6 +597,7 @@ void tile(Monitor *m) {
n = m->visible_tiling_clients; n = m->visible_tiling_clients;
master_num = m->pertag->nmasters[m->pertag->curtag]; master_num = m->pertag->nmasters[m->pertag->curtag];
master_num = n > master_num ? master_num : n;
stack_num = n - master_num; stack_num = n - master_num;
if (n == 0) if (n == 0)
@@ -692,6 +695,7 @@ void right_tile(Monitor *m) {
n = m->visible_tiling_clients; n = m->visible_tiling_clients;
master_num = m->pertag->nmasters[m->pertag->curtag]; master_num = m->pertag->nmasters[m->pertag->curtag];
master_num = n > master_num ? master_num : n;
stack_num = n - master_num; stack_num = n - master_num;
if (n == 0) if (n == 0)

1
src/layout/vertical.h
View File

@@ -8,6 +8,7 @@ void vertical_tile(Monitor *m) {
n = m->visible_tiling_clients; n = m->visible_tiling_clients;
master_num = m->pertag->nmasters[m->pertag->curtag]; master_num = m->pertag->nmasters[m->pertag->curtag];
master_num = n > master_num ? master_num : n;
stack_num = n - master_num; stack_num = n - master_num;
if (n == 0) if (n == 0)