mirrors/maomaowm
1
0
Fork 0
mirror of https://github.com/DreamMaoMao/maomaowm.git synced 2026-03-11 05:34:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

feat: support resize scroller stack

Browse source
This commit is contained in:
DreamMaoMao 2026-01-17 17:30:04 +08:00
parent 9adb80d29f
commit d7a72ce680
4 changed files with 45 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/layout/arrange.h
View file

@ -378,6 +378,7 @@ void resize_tile_scroller(Client *grabc, bool isdrag, int32_t offsetx,
int32_t offsety, uint32_t time, bool isvertical) {
float delta_x, delta_y;
float new_scroller_proportion;
float new_stack_proportion;
if (grabc && grabc->mon->visible_tiling_clients == 1 &&
!scroller_ignore_proportion_single)
@ -390,6 +391,7 @@ void resize_tile_scroller(Client *grabc, bool isdrag, int32_t offsetx,
// 记录初始状态
grabc->old_scroller_pproportion = grabc->scroller_proportion;
grabc->old_stack_proportion = grabc->stack_proportion;
grabc->cursor_in_left_half =
cursor->x < grabc->geom.x + grabc->geom.width / 2;
@ -410,14 +412,22 @@ void resize_tile_scroller(Client *grabc, bool isdrag, int32_t offsetx,
grabc->old_stack_inner_per = grabc->stack_inner_per;
grabc->drag_begin_geom = grabc->geom;
grabc->old_scroller_pproportion = grabc->scroller_proportion;
grabc->old_stack_proportion = grabc->stack_proportion;
grabc->cursor_in_upper_half = false;
grabc->cursor_in_left_half = false;
}
delta_x = (float)(offsetx) * (grabc->old_scroller_pproportion) /
grabc->drag_begin_geom.width;
delta_y = (float)(offsety) * (grabc->old_scroller_pproportion) /
grabc->drag_begin_geom.height;
if (isvertical) {
delta_y = (float)(offsety) * (grabc->old_scroller_pproportion) /
grabc->drag_begin_geom.height;
delta_x = (float)(offsetx) * (grabc->old_stack_proportion) /
grabc->drag_begin_geom.width;
} else {
delta_x = (float)(offsetx) * (grabc->old_scroller_pproportion) /
grabc->drag_begin_geom.width;
delta_y = (float)(offsety) * (grabc->old_stack_proportion) /
grabc->drag_begin_geom.height;
}
bool moving_up;
bool moving_down;
@ -452,20 +462,36 @@ void resize_tile_scroller(Client *grabc, bool isdrag, int32_t offsetx,
delta_x = -fabsf(delta_x);
}
if (isvertical) {
if (!grabc->next_in_stack && grabc->prev_in_stack && !isdrag) {
delta_x = delta_x * -1.0f;
}
} else {
if (!grabc->next_in_stack && grabc->prev_in_stack && !isdrag) {
delta_y = delta_y * -1.0f;
}
}
// 直接设置新的比例，基于初始值 + 变化量
if (isvertical) {
new_scroller_proportion = grabc->old_scroller_pproportion + delta_y;
new_stack_proportion = grabc->old_stack_proportion + delta_x;
} else {
new_scroller_proportion = grabc->old_scroller_pproportion + delta_x;
new_stack_proportion = grabc->old_stack_proportion + delta_y;
}
// 应用限制，确保比例在合理范围内
new_scroller_proportion =
fmaxf(0.1f, fminf(1.0f, new_scroller_proportion));
new_stack_proportion = fmaxf(0.1f, fminf(1.0f, new_stack_proportion));
grabc->scroller_proportion = new_scroller_proportion;
if(grabc->prev_in_stack) {
grabc->prev_in_stack->scroller_proportion = grabc->scroller_proportion;
grabc->stack_proportion = new_stack_proportion;
if (grabc->prev_in_stack) {
grabc->prev_in_stack->scroller_proportion =
grabc->scroller_proportion;
}
if (!isdrag) {

8
src/layout/horizontal.h
View file

@ -227,8 +227,9 @@ void arrange_stack(Client *scroller_stack_head, struct wlr_box geometry,
float total_proportion = 0.0f;
iter = scroller_stack_head;
while (iter) {
if(iter->stack_proportion <= 0.0f || iter->stack_proportion >= 1.0f) {
iter->stack_proportion = stack_size == 1 ? 1.0f : 1.0f/(stack_size - 1);
if (iter->stack_proportion <= 0.0f || iter->stack_proportion >= 1.0f) {
iter->stack_proportion =
stack_size == 1 ? 1.0f : 1.0f / (stack_size - 1);
}
total_proportion += iter->stack_proportion;
iter = iter->next_in_stack;
@ -248,7 +249,8 @@ void arrange_stack(Client *scroller_stack_head, struct wlr_box geometry,
iter = scroller_stack_head;
while (iter) {
client_height = remain_client_height * (iter->stack_proportion / remain_proportion);
client_height =
remain_client_height * (iter->stack_proportion / remain_proportion);
struct wlr_box client_geom = {.x = geometry.x,
.y = current_y,

12
src/layout/vertical.h
View file

@ -199,8 +199,8 @@ void vertical_scroll_adjust_fullandmax(Client *c, struct wlr_box *target_geom) {
target_geom->x = m->w.x + (m->w.width - target_geom->width) / 2;
}
void arrange_stack_vertical(Client *scroller_stack_head, struct wlr_box geometry,
int32_t gappih) {
void arrange_stack_vertical(Client *scroller_stack_head,
struct wlr_box geometry, int32_t gappih) {
int32_t stack_size = 0;
Client *iter = scroller_stack_head;
while (iter) {
@ -214,8 +214,9 @@ void arrange_stack_vertical(Client *scroller_stack_head, struct wlr_box geometry
float total_proportion = 0.0f;
iter = scroller_stack_head;
while (iter) {
if(iter->stack_proportion <= 0.0f || iter->stack_proportion >= 1.0f) {
iter->stack_proportion = stack_size == 1 ? 1.0f : 1.0f/(stack_size - 1);
if (iter->stack_proportion <= 0.0f || iter->stack_proportion >= 1.0f) {
iter->stack_proportion =
stack_size == 1 ? 1.0f : 1.0f / (stack_size - 1);
}
total_proportion += iter->stack_proportion;
iter = iter->next_in_stack;
@ -235,7 +236,8 @@ void arrange_stack_vertical(Client *scroller_stack_head, struct wlr_box geometry
iter = scroller_stack_head;
while (iter) {
client_width = remain_client_width * (iter->stack_proportion / remain_proportion);
client_width =
remain_client_width * (iter->stack_proportion / remain_proportion);
struct wlr_box client_geom = {.y = geometry.y,
.x = current_x,

1
src/mango.c
View file

@ -376,6 +376,7 @@ struct Client {
bool is_restoring_from_ov;
float scroller_proportion;
float stack_proportion;
float old_stack_proportion;
bool need_output_flush;
struct dwl_animation animation;
struct dwl_opacity_animation opacity_animation;