split ui view clamp rule into separate x/y flags

This commit is contained in:
Ryan Fleury
2024-01-30 08:02:25 -08:00
parent c9b22acd5a
commit c61ff1910c
3 changed files with 49 additions and 46 deletions
+4 -4
View File
@@ -1213,8 +1213,8 @@ ui_end_build(void)
ClampBot(0, box->view_bounds.x - box->fixed_size.x),
ClampBot(0, box->view_bounds.y - box->fixed_size.y),
};
box->view_off_target.x = Clamp(0, box->view_off_target.x, max_view_off_target.x);
box->view_off_target.y = Clamp(0, box->view_off_target.y, max_view_off_target.y);
if(box->flags & UI_BoxFlag_ViewClampX) { box->view_off_target.x = Clamp(0, box->view_off_target.x, max_view_off_target.x); }
if(box->flags & UI_BoxFlag_ViewClampY) { box->view_off_target.y = Clamp(0, box->view_off_target.y, max_view_off_target.y); }
}
// rjf: animate view offset
@@ -2560,8 +2560,8 @@ ui_signal_from_box(UI_Box *box)
ClampBot(0, box->view_bounds.x - box->fixed_size.x),
ClampBot(0, box->view_bounds.y - box->fixed_size.y),
};
box->view_off_target.x = Clamp(0, box->view_off_target.x, max_view_off_target.x);
box->view_off_target.y = Clamp(0, box->view_off_target.y, max_view_off_target.y);
if(box->flags & UI_BoxFlag_ViewClampX) { box->view_off_target.x = Clamp(0, box->view_off_target.x, max_view_off_target.x); }
if(box->flags & UI_BoxFlag_ViewClampY) { box->view_off_target.y = Clamp(0, box->view_off_target.y, max_view_off_target.y); }
}
}