From 3de8779d537ab2795a22e8db683b0d3c33f6eff4 Mon Sep 17 00:00:00 2001 From: Allen Webster Date: Fri, 9 Sep 2016 13:02:57 -0400 Subject: [PATCH] got the new fixed position layout mode working --- 4ed.cpp | 2 +- 4ed_layout.cpp | 75 +++++++++++++++++++++++++++++++++++++++++++++++--- TODO.txt | 2 +- 3 files changed, 73 insertions(+), 6 deletions(-) diff --git a/4ed.cpp b/4ed.cpp index 6844277f..ab513d7a 100644 --- a/4ed.cpp +++ b/4ed.cpp @@ -2616,7 +2616,7 @@ App_Step_Sig(app_step){ Panel_Divider *divider = vars->resizing.divider; i32 mouse_position = 0; - b32 do_absolute_positions = 0; + b32 do_absolute_positions = 1; if (do_absolute_positions){ i32 absolute_positions[MAX_VIEWS]; i32 min = 0, max = 0; diff --git a/4ed_layout.cpp b/4ed_layout.cpp index 6497001a..c9dd13c9 100644 --- a/4ed_layout.cpp +++ b/4ed_layout.cpp @@ -381,8 +381,7 @@ layout_compute_abs_step(Editing_Layout *layout, i32 divider_id, i32_Rect rect, i } i32 pos = lerp(p0, div->pos, p1); - i32_Rect r1, r2; - r1 = rect; r2 = rect; + i32_Rect r1 = rect, r2 = rect; abs_pos[divider_id] = pos; @@ -441,7 +440,32 @@ layout_get_min_max_step_up(Editing_Layout *layout, b32 v, i32 divider_id, i32 wh internal void layout_get_min_max_step_down(Editing_Layout *layout, b32 v, i32 divider_id, i32 which_child, i32 *abs_pos, i32 *min_out, i32 *max_out){ + Panel_Divider *divider = layout->dividers + divider_id; + // NOTE(allen): The min/max is switched here, because children on the -1 side + // effect min, while if you are on the -1 side your parent effects max. + if (divider->v_divider == v){ + if (which_child == -1){ + if (*min_out < abs_pos[divider_id]){ + *min_out = abs_pos[divider_id]; + } + } + else{ + if (*max_out > abs_pos[divider_id]){ + *max_out = abs_pos[divider_id]; + } + } + } + + if (divider->child1 != -1){ + layout_get_min_max_step_down(layout, v, divider->child1, which_child, + abs_pos, min_out, max_out); + } + + if (divider->child2 != -1){ + layout_get_min_max_step_down(layout, v, divider->child2, which_child, + abs_pos, min_out, max_out); + } } internal void @@ -461,7 +485,7 @@ layout_get_min_max(Editing_Layout *layout, Panel_Divider *divider, i32 *abs_pos, } if (divider->child2 != -1){ - layout_get_min_max_step_down(layout, divider->v_divider, divider->child1, 1, + layout_get_min_max_step_down(layout, divider->v_divider, divider->child2, 1, abs_pos, min_out, max_out); } } @@ -476,8 +500,51 @@ layout_get_min_max(Editing_Layout *layout, Panel_Divider *divider, i32 *abs_pos, } internal void -layout_update_all_positions(Editing_Layout *layout, i32 *abs_pos){ +layout_update_pos_step(Editing_Layout *layout, i32 divider_id, i32_Rect rect, i32 *abs_pos){ + Panel_Divider *div = layout->dividers + divider_id; + i32 p0 = 0, p1 = 0; + if (div->v_divider){ + p0 = rect.x0; p1 = rect.x1; + } + else{ + p0 = rect.y0; p1 = rect.y1; + } + + i32 pos = abs_pos[divider_id]; + i32_Rect r1 = rect, r2 = rect; + f32 lpos = unlerp((f32)p0, (f32)pos, (f32)p1); + + div->pos = lpos; + + if (div->v_divider){ + Assert(r1.x0 <= pos && pos <= r2.x1); + r1.x1 = pos; r2.x0 = pos; + } + else{ + Assert(r1.y0 <= pos && pos <= r2.y1); + r1.y1 = pos; r2.y0 = pos; + } + + if (div->child1 != -1){ + layout_update_pos_step(layout, div->child1, r1, abs_pos); + } + + if (div->child2 != -1){ + layout_update_pos_step(layout, div->child2, r2, abs_pos); + } +} + +internal void +layout_update_all_positions(Editing_Layout *layout, i32 *abs_pos){ + i32_Rect r; + r.x0 = 0; + r.y0 = 0; + r.x1 = layout->full_width; + r.y1 = layout->full_height; + if (layout->panel_count > 1){ + layout_update_pos_step(layout, layout->root, r, abs_pos); + } } // BOTTOM diff --git a/TODO.txt b/TODO.txt index f5641225..353051e0 100644 --- a/TODO.txt +++ b/TODO.txt @@ -86,6 +86,7 @@ ; BEFORE I SHIP ; +; [X] make panel resizing not whacky with child panels ; [X] case insensitive interactive switch buffer ; [X] tokens in the custom API ; [X] token seeking on custom side @@ -95,7 +96,6 @@ ; [] clean up and comment the auto indent code to allow for customizations ; [] more built in options for auto indenting ; [] expose dirty flags -; [] make panel resizing not whacky with child panels ; [] mouse down/up distinction ; [] occasionally missing the (!) mark on files on windows ; [] scroll down on compilation buffer durring compilation