ed/raddebugger
1
0
Fork 0
mirror of https://github.com/Ed94/raddebugger.git synced 2026-07-30 03:00:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge view rules & view specs entirely; simplify graphical view rules down to single hook

Browse Source
This commit is contained in:
Ryan Fleury
2024-09-16 14:44:28 -07:00
parent 84f685803d
commit 9899efe93c
19 changed files with 680 additions and 1153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ui/ui_core.c
+10 -10
View File
@@ -554,11 +554,11 @@ ui_next_event(UI_Event **ev)
{
good = 0;
}
if(!(perms & UI_PermissionFlag_ScrollX) && (n->v.kind == UI_EventKind_Scroll) && (n->v.delta_2f32.x != 0 || n->v.modifiers & OS_EventFlag_Shift))
if(!(perms & UI_PermissionFlag_ScrollX) && (n->v.kind == UI_EventKind_Scroll) && (n->v.delta_2f32.x != 0 || n->v.modifiers & OS_Modifier_Shift))
{
good = 0;
}
if(!(perms & UI_PermissionFlag_ScrollY) && (n->v.kind == UI_EventKind_Scroll) && n->v.delta_2f32.y != 0 && !(n->v.modifiers & OS_EventFlag_Shift))
if(!(perms & UI_PermissionFlag_ScrollY) && (n->v.kind == UI_EventKind_Scroll) && n->v.delta_2f32.y != 0 && !(n->v.modifiers & OS_Modifier_Shift))
{
good = 0;
}
@@ -599,7 +599,7 @@ ui_eat_event(UI_Event *ev)
//- rjf: event consumption helpers
internal B32
ui_key_press(OS_EventFlags mods, OS_Key key)
ui_key_press(OS_Modifiers mods, OS_Key key)
{
B32 result = 0;
for(UI_Event *evt = 0; ui_next_event(&evt);)
@@ -615,7 +615,7 @@ ui_key_press(OS_EventFlags mods, OS_Key key)
}
internal B32
ui_key_release(OS_EventFlags mods, OS_Key key)
ui_key_release(OS_Modifiers mods, OS_Key key)
{
B32 result = 0;
for(UI_Event *evt = 0; ui_next_event(&evt);)
@@ -875,7 +875,7 @@ ui_begin_build(OS_Handle window, UI_EventList *events, UI_IconInfo *icon_info, U
{
nav_next = 1;
}
if(ui_key_press(OS_EventFlag_Shift, OS_Key_Tab))
if(ui_key_press(OS_Modifier_Shift, OS_Key_Tab))
{
nav_prev = 1;
}
@@ -2541,7 +2541,7 @@ ui_signal_from_box(UI_Box *box)
ProfBeginFunction();
B32 is_focus_hot = box->flags & UI_BoxFlag_FocusHot && !(box->flags & UI_BoxFlag_FocusHotDisabled);
UI_Signal sig = {box};
sig.event_flags |= os_get_event_flags();
sig.event_flags |= os_get_modifiers();
//////////////////////////////
//- rjf: calculate possibly-clipped box rectangle
@@ -2712,11 +2712,11 @@ ui_signal_from_box(UI_Box *box)
//- rjf: scrolling
if(box->flags & UI_BoxFlag_Scroll &&
evt->kind == UI_EventKind_Scroll &&
evt->modifiers != OS_EventFlag_Ctrl &&
evt->modifiers != OS_Modifier_Ctrl &&
evt_mouse_in_bounds)
{
Vec2F32 delta = evt->delta_2f32;
if(evt->modifiers & OS_EventFlag_Shift)
if(evt->modifiers & OS_Modifier_Shift)
{
Swap(F32, delta.x, delta.y);
}
@@ -2733,11 +2733,11 @@ ui_signal_from_box(UI_Box *box)
//- rjf: view scrolling
if(box->flags & UI_BoxFlag_ViewScroll && box->first_touched_build_index != box->last_touched_build_index &&
evt->kind == UI_EventKind_Scroll &&
evt->modifiers != OS_EventFlag_Ctrl &&
evt->modifiers != OS_Modifier_Ctrl &&
evt_mouse_in_bounds)
{
Vec2F32 delta = evt->delta_2f32;
if(evt->modifiers & OS_EventFlag_Shift)
if(evt->modifiers & OS_Modifier_Shift)
{
Swap(F32, delta.x, delta.y);
}
src/ui/ui_core.h
+4 -4
View File
@@ -140,7 +140,7 @@ struct UI_Event
UI_EventFlags flags;
UI_EventDeltaUnit delta_unit;
OS_Key key;
OS_EventFlags modifiers;
OS_Modifiers modifiers;
String8 string;
String8List paths;
Vec2F32 pos;
@@ -547,7 +547,7 @@ typedef struct UI_Signal UI_Signal;
struct UI_Signal
{
UI_Box *box;
OS_EventFlags event_flags;
OS_Modifiers event_flags;
Vec2S16 scroll;
UI_SignalFlags f;
};
@@ -795,8 +795,8 @@ internal B32 ui_next_event(UI_Event **ev);
internal void ui_eat_event(UI_Event *ev);
//- rjf: event consumption helpers
internal B32 ui_key_press(OS_EventFlags mods, OS_Key key);
internal B32 ui_key_release(OS_EventFlags mods, OS_Key key);
internal B32 ui_key_press(OS_Modifiers mods, OS_Key key);
internal B32 ui_key_release(OS_Modifiers mods, OS_Key key);
internal B32 ui_text(U32 character);
internal B32 ui_slot_press(UI_EventActionSlot slot);