got the new fixed position layout mode working

This commit is contained in:
Allen Webster 2016-09-09 13:02:57 -04:00
parent 5a20959c5b
commit 3de8779d53
3 changed files with 73 additions and 6 deletions

View File

@ -2616,7 +2616,7 @@ App_Step_Sig(app_step){
Panel_Divider *divider = vars->resizing.divider; Panel_Divider *divider = vars->resizing.divider;
i32 mouse_position = 0; i32 mouse_position = 0;
b32 do_absolute_positions = 0; b32 do_absolute_positions = 1;
if (do_absolute_positions){ if (do_absolute_positions){
i32 absolute_positions[MAX_VIEWS]; i32 absolute_positions[MAX_VIEWS];
i32 min = 0, max = 0; i32 min = 0, max = 0;

View File

@ -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 pos = lerp(p0, div->pos, p1);
i32_Rect r1, r2; i32_Rect r1 = rect, r2 = rect;
r1 = rect; r2 = rect;
abs_pos[divider_id] = pos; 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 internal void
layout_get_min_max_step_down(Editing_Layout *layout, b32 v, i32 divider_id, i32 which_child, 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){ 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 internal void
@ -461,7 +485,7 @@ layout_get_min_max(Editing_Layout *layout, Panel_Divider *divider, i32 *abs_pos,
} }
if (divider->child2 != -1){ 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); 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 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 // BOTTOM

View File

@ -86,6 +86,7 @@
; BEFORE I SHIP ; BEFORE I SHIP
; ;
; [X] make panel resizing not whacky with child panels
; [X] case insensitive interactive switch buffer ; [X] case insensitive interactive switch buffer
; [X] tokens in the custom API ; [X] tokens in the custom API
; [X] token seeking on custom side ; [X] token seeking on custom side
@ -95,7 +96,6 @@
; [] clean up and comment the auto indent code to allow for customizations ; [] clean up and comment the auto indent code to allow for customizations
; [] more built in options for auto indenting ; [] more built in options for auto indenting
; [] expose dirty flags ; [] expose dirty flags
; [] make panel resizing not whacky with child panels
; [] mouse down/up distinction ; [] mouse down/up distinction
; [] occasionally missing the (!) mark on files on windows ; [] occasionally missing the (!) mark on files on windows
; [] scroll down on compilation buffer durring compilation ; [] scroll down on compilation buffer durring compilation