mirrors/maomaowm
1
0
Fork 0
mirror of https://github.com/DreamMaoMao/maomaowm.git synced 2025-11-03 09:01:47 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

opt: optimize grid layout gap

Browse source
This commit is contained in:
DreamMaoMao 2025-10-11 18:25:08 +08:00
parent b10a6eed2b
commit 5e3c3cde77
2 changed files with 40 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/layout/horizontal.h
View file

@ -6,6 +6,10 @@ void grid(Monitor *m) {
unsigned int cols, rows, overcols; unsigned int cols, rows, overcols;
Client *c = NULL; Client *c = NULL;
n = 0; n = 0;
int target_gappo = enablegaps ? m->isoverview ? overviewgappo : gappoh : 0;
int target_gappi = enablegaps ? m->isoverview ? overviewgappi : gappih : 0;
float single_width_ratio = m->isoverview ? 0.7 : 0.9;
float single_height_ratio = m->isoverview ? 0.8 : 0.9;
n = m->isoverview ? m->visible_clients : m->visible_tiling_clients; n = m->isoverview ? m->visible_clients : m->visible_tiling_clients;
@ -26,8 +30,8 @@ void grid(Monitor *m) {
if (VISIBLEON(c, m) && !c->isunglobal && if (VISIBLEON(c, m) && !c->isunglobal &&
((m->isoverview && !client_should_ignore_focus(c)) || ((m->isoverview && !client_should_ignore_focus(c)) ||
ISTILED(c))) { ISTILED(c))) {
cw = (m->w.width - 2 * overviewgappo) * 0.7; cw = (m->w.width - 2 * target_gappo) * single_width_ratio;
ch = (m->w.height - 2 * overviewgappo) * 0.8; ch = (m->w.height - 2 * target_gappo) * single_height_ratio;
c->geom.x = m->w.x + (m->w.width - cw) / 2; c->geom.x = m->w.x + (m->w.width - cw) / 2;
c->geom.y = m->w.y + (m->w.height - ch) / 2; c->geom.y = m->w.y + (m->w.height - ch) / 2;
c->geom.width = cw - 2 * c->bw; c->geom.width = cw - 2 * c->bw;
@ -39,8 +43,8 @@ void grid(Monitor *m) {
} }
if (n == 2) { if (n == 2) {
cw = (m->w.width - 2 * overviewgappo - overviewgappi) / 2; cw = (m->w.width - 2 * target_gappo - target_gappi) / 2;
ch = (m->w.height - 2 * overviewgappo) * 0.65; ch = (m->w.height - 2 * target_gappo) * 0.65;
i = 0; i = 0;
wl_list_for_each(c, &clients, link) { wl_list_for_each(c, &clients, link) {
if (c->mon != m) if (c->mon != m)
@ -54,14 +58,14 @@ void grid(Monitor *m) {
((m->isoverview && !client_should_ignore_focus(c)) || ((m->isoverview && !client_should_ignore_focus(c)) ||
ISTILED(c))) { ISTILED(c))) {
if (i == 0) { if (i == 0) {
c->geom.x = m->w.x + overviewgappo; c->geom.x = m->w.x + target_gappo;
c->geom.y = m->w.y + (m->w.height - ch) / 2 + overviewgappo; c->geom.y = m->w.y + (m->w.height - ch) / 2 + target_gappo;
c->geom.width = cw - 2 * c->bw; c->geom.width = cw - 2 * c->bw;
c->geom.height = ch - 2 * c->bw; c->geom.height = ch - 2 * c->bw;
resize(c, c->geom, 0); resize(c, c->geom, 0);
} else if (i == 1) { } else if (i == 1) {
c->geom.x = m->w.x + cw + overviewgappo + overviewgappi; c->geom.x = m->w.x + cw + target_gappo + target_gappi;
c->geom.y = m->w.y + (m->w.height - ch) / 2 + overviewgappo; c->geom.y = m->w.y + (m->w.height - ch) / 2 + target_gappo;
c->geom.width = cw - 2 * c->bw; c->geom.width = cw - 2 * c->bw;
c->geom.height = ch - 2 * c->bw; c->geom.height = ch - 2 * c->bw;
resize(c, c->geom, 0); resize(c, c->geom, 0);
@ -81,14 +85,14 @@ void grid(Monitor *m) {
rows = (cols && (cols - 1) * cols >= n) ? cols - 1 : cols; rows = (cols && (cols - 1) * cols >= n) ? cols - 1 : cols;
// 计算每个客户端的高度和宽度 // 计算每个客户端的高度和宽度
ch = (m->w.height - 2 * overviewgappo - (rows - 1) * overviewgappi) / rows; ch = (m->w.height - 2 * target_gappo - (rows - 1) * target_gappi) / rows;
cw = (m->w.width - 2 * overviewgappo - (cols - 1) * overviewgappi) / cols; cw = (m->w.width - 2 * target_gappo - (cols - 1) * target_gappi) / cols;
// 处理多余的列 // 处理多余的列
overcols = n % cols; overcols = n % cols;
if (overcols) { if (overcols) {
dx = (m->w.width - overcols * cw - (overcols - 1) * overviewgappi) / 2 - dx = (m->w.width - overcols * cw - (overcols - 1) * target_gappi) / 2 -
overviewgappo; target_gappo;
} }
// 调整每个客户端的位置和大小 // 调整每个客户端的位置和大小
@ -103,13 +107,13 @@ void grid(Monitor *m) {
: borderpx; : borderpx;
if (VISIBLEON(c, m) && !c->isunglobal && if (VISIBLEON(c, m) && !c->isunglobal &&
((m->isoverview && !client_should_ignore_focus(c)) || ISTILED(c))) { ((m->isoverview && !client_should_ignore_focus(c)) || ISTILED(c))) {
cx = m->w.x + (i % cols) * (cw + overviewgappi); cx = m->w.x + (i % cols) * (cw + target_gappi);
cy = m->w.y + (i / cols) * (ch + overviewgappi); cy = m->w.y + (i / cols) * (ch + target_gappi);
if (overcols && i >= n - overcols) { if (overcols && i >= n - overcols) {
cx += dx; cx += dx;
} }
c->geom.x = cx + overviewgappo; c->geom.x = cx + target_gappo;
c->geom.y = cy + overviewgappo; c->geom.y = cy + target_gappo;
c->geom.width = cw - 2 * c->bw; c->geom.width = cw - 2 * c->bw;
c->geom.height = ch - 2 * c->bw; c->geom.height = ch - 2 * c->bw;
resize(c, c->geom, 0); resize(c, c->geom, 0);

37
src/layout/vertical.h
View file

@ -224,6 +224,10 @@ void vertical_grid(Monitor *m) {
unsigned int dy; unsigned int dy;
unsigned int rows, cols, overrows; unsigned int rows, cols, overrows;
Client *c = NULL; Client *c = NULL;
int target_gappo = enablegaps ? m->isoverview ? overviewgappo : gappov : 0;
int target_gappi = enablegaps ? m->isoverview ? overviewgappi : gappiv : 0;
float single_width_ratio = m->isoverview ? 0.7 : 0.9;
float single_height_ratio = m->isoverview ? 0.8 : 0.9;
n = m->isoverview ? m->visible_clients : m->visible_tiling_clients; n = m->isoverview ? m->visible_clients : m->visible_tiling_clients;
@ -244,8 +248,8 @@ void vertical_grid(Monitor *m) {
if (VISIBLEON(c, m) && !c->isunglobal && if (VISIBLEON(c, m) && !c->isunglobal &&
((m->isoverview && !client_should_ignore_focus(c)) || ((m->isoverview && !client_should_ignore_focus(c)) ||
ISTILED(c))) { ISTILED(c))) {
ch = (m->w.height - 2 * overviewgappo) * 0.7; ch = (m->w.height - 2 * target_gappo) * single_height_ratio;
cw = (m->w.width - 2 * overviewgappo) * 0.8; cw = (m->w.width - 2 * target_gappo) * single_width_ratio;
c->geom.x = m->w.x + (m->w.width - cw) / 2; c->geom.x = m->w.x + (m->w.width - cw) / 2;
c->geom.y = m->w.y + (m->w.height - ch) / 2; c->geom.y = m->w.y + (m->w.height - ch) / 2;
c->geom.width = cw - 2 * c->bw; c->geom.width = cw - 2 * c->bw;
@ -257,8 +261,8 @@ void vertical_grid(Monitor *m) {
} }
if (n == 2) { if (n == 2) {
ch = (m->w.height - 2 * overviewgappo - overviewgappi) / 2; ch = (m->w.height - 2 * target_gappo - target_gappi) / 2;
cw = (m->w.width - 2 * overviewgappo) * 0.65; cw = (m->w.width - 2 * target_gappo) * 0.65;
i = 0; i = 0;
wl_list_for_each(c, &clients, link) { wl_list_for_each(c, &clients, link) {
@ -273,14 +277,14 @@ void vertical_grid(Monitor *m) {
((m->isoverview && !client_should_ignore_focus(c)) || ((m->isoverview && !client_should_ignore_focus(c)) ||
ISTILED(c))) { ISTILED(c))) {
if (i == 0) { if (i == 0) {
c->geom.x = m->w.x + (m->w.width - cw) / 2 + overviewgappo; c->geom.x = m->w.x + (m->w.width - cw) / 2 + target_gappo;
c->geom.y = m->w.y + overviewgappo; c->geom.y = m->w.y + target_gappo;
c->geom.width = cw - 2 * c->bw; c->geom.width = cw - 2 * c->bw;
c->geom.height = ch - 2 * c->bw; c->geom.height = ch - 2 * c->bw;
resize(c, c->geom, 0); resize(c, c->geom, 0);
} else if (i == 1) { } else if (i == 1) {
c->geom.x = m->w.x + (m->w.width - cw) / 2 + overviewgappo; c->geom.x = m->w.x + (m->w.width - cw) / 2 + target_gappo;
c->geom.y = m->w.y + ch + overviewgappo + overviewgappi; c->geom.y = m->w.y + ch + target_gappo + target_gappi;
c->geom.width = cw - 2 * c->bw; c->geom.width = cw - 2 * c->bw;
c->geom.height = ch - 2 * c->bw; c->geom.height = ch - 2 * c->bw;
resize(c, c->geom, 0); resize(c, c->geom, 0);
@ -298,14 +302,13 @@ void vertical_grid(Monitor *m) {
} }
cols = (rows && (rows - 1) * rows >= n) ? rows - 1 : rows; cols = (rows && (rows - 1) * rows >= n) ? rows - 1 : rows;
cw = (m->w.width - 2 * overviewgappo - (cols - 1) * overviewgappi) / cols; cw = (m->w.width - 2 * target_gappo - (cols - 1) * target_gappi) / cols;
ch = (m->w.height - 2 * overviewgappo - (rows - 1) * overviewgappi) / rows; ch = (m->w.height - 2 * target_gappo - (rows - 1) * target_gappi) / rows;
overrows = n % rows; overrows = n % rows;
if (overrows) { if (overrows) {
dy = dy = (m->w.height - overrows * ch - (overrows - 1) * target_gappi) / 2 -
(m->w.height - overrows * ch - (overrows - 1) * overviewgappi) / 2 - target_gappo;
overviewgappo;
} }
i = 0; i = 0;
@ -319,13 +322,13 @@ void vertical_grid(Monitor *m) {
: borderpx; : borderpx;
if (VISIBLEON(c, m) && !c->isunglobal && if (VISIBLEON(c, m) && !c->isunglobal &&
((m->isoverview && !client_should_ignore_focus(c)) || ISTILED(c))) { ((m->isoverview && !client_should_ignore_focus(c)) || ISTILED(c))) {
cx = m->w.x + (i / rows) * (cw + overviewgappi); cx = m->w.x + (i / rows) * (cw + target_gappi);
cy = m->w.y + (i % rows) * (ch + overviewgappi); cy = m->w.y + (i % rows) * (ch + target_gappi);
if (overrows && i >= n - overrows) { if (overrows && i >= n - overrows) {
cy += dy; cy += dy;
} }
c->geom.x = cx + overviewgappo; c->geom.x = cx + target_gappo;
c->geom.y = cy + overviewgappo; c->geom.y = cy + target_gappo;
c->geom.width = cw - 2 * c->bw; c->geom.width = cw - 2 * c->bw;
c->geom.height = ch - 2 * c->bw; c->geom.height = ch - 2 * c->bw;
resize(c, c->geom, 0); resize(c, c->geom, 0);