diff --git a/src/raddbg/raddbg_core.c b/src/raddbg/raddbg_core.c index a44b4bfd..03ff2988 100644 --- a/src/raddbg/raddbg_core.c +++ b/src/raddbg/raddbg_core.c @@ -5302,7 +5302,6 @@ rd_view_ui(Rng2F32 rect) ui_top_font_size()*1.5f + ui_top_font_size()*3.f)) UI_CornerRadius(ui_top_font_size()*1.5f) UI_TextAlignment(UI_TextAlign_Center) - UI_HoverCursor(OS_Cursor_HandPoint) RD_Font(RD_FontSlot_Icons) UI_FontSize(ui_top_font_size()*0.8f) { @@ -8572,7 +8571,6 @@ rd_window_frame(void) { ui_set_next_pref_width(ui_children_sum(1)); ui_set_next_child_layout_axis(Axis2_X); - ui_set_next_hover_cursor(OS_Cursor_HandPoint); UI_Box *user_box = ui_build_box_from_stringf(UI_BoxFlag_Clickable| UI_BoxFlag_DrawBorder| UI_BoxFlag_DrawBackground| @@ -8606,7 +8604,6 @@ rd_window_frame(void) { ui_set_next_pref_width(ui_children_sum(1)); ui_set_next_child_layout_axis(Axis2_X); - ui_set_next_hover_cursor(OS_Cursor_HandPoint); UI_Box *prof_box = ui_build_box_from_stringf(UI_BoxFlag_Clickable| UI_BoxFlag_DrawBorder| UI_BoxFlag_DrawBackground| @@ -9644,7 +9641,6 @@ rd_window_frame(void) { ui_spacer(ui_px(1.f, 1.f)); } - ui_set_next_hover_cursor(OS_Cursor_HandPoint); UI_Box *tab_box = ui_build_box_from_stringf(UI_BoxFlag_DrawHotEffects| UI_BoxFlag_DrawBackground| UI_BoxFlag_DrawBorder| @@ -9671,7 +9667,6 @@ rd_window_frame(void) UI_CornerRadius00(0) UI_CornerRadius01(0) { - ui_set_next_hover_cursor(OS_Cursor_HandPoint); UI_Box *close_box = ui_build_box_from_stringf(UI_BoxFlag_Clickable| UI_BoxFlag_DrawBorder| UI_BoxFlag_DrawBackground| @@ -9745,7 +9740,6 @@ rd_window_frame(void) { ui_spacer(ui_px(1.f, 1.f)); } - ui_set_next_hover_cursor(OS_Cursor_HandPoint); ui_set_next_group_key(catchall_drop_site_key); UI_Box *tab_box = ui_build_box_from_key(UI_BoxFlag_DrawHotEffects| UI_BoxFlag_DrawBackground| @@ -9786,7 +9780,6 @@ rd_window_frame(void) UI_FontSize(ui_top_font_size()) UI_TagF("implicit") UI_TagF("weak") - UI_HoverCursor(OS_Cursor_HandPoint) { UI_Box *add_new_box = ui_build_box_from_stringf(UI_BoxFlag_DrawText| UI_BoxFlag_DrawBorder| diff --git a/src/raddbg/raddbg_widgets.c b/src/raddbg/raddbg_widgets.c index 3537a855..b88ebf2f 100644 --- a/src/raddbg/raddbg_widgets.c +++ b/src/raddbg/raddbg_widgets.c @@ -729,7 +729,6 @@ rd_cmd_binding_buttons(String8 name) //- rjf: build box ui_set_next_tag(has_conflicts ? str8_lit("bad_pop") : rebinding_active_for_this_binding ? str8_lit("pop") : str8_zero()); - ui_set_next_hover_cursor(OS_Cursor_HandPoint); ui_set_next_text_alignment(UI_TextAlign_Center); ui_set_next_group_key(ui_key_zero()); ui_set_next_pref_width(ui_text_dim(ui_top_font_size()*1.f, 1)); @@ -803,7 +802,6 @@ rd_cmd_binding_buttons(String8 name) rd_state->bind_change_binding_id == 0); RD_Font(RD_FontSlot_Icons) UI_TagF(adding_new_binding ? "pop" : "") { - ui_set_next_hover_cursor(OS_Cursor_HandPoint); ui_set_next_text_alignment(UI_TextAlign_Center); ui_set_next_group_key(ui_key_zero()); ui_set_next_pref_width(ui_text_dim(ui_top_font_size()*1.f, 1)); @@ -837,7 +835,6 @@ rd_cmd_binding_buttons(String8 name) internal UI_Signal rd_menu_bar_button(String8 string) { - ui_set_next_hover_cursor(OS_Cursor_HandPoint); UI_Box *box = ui_build_box_from_string(UI_BoxFlag_DrawText|UI_BoxFlag_DrawBorder|UI_BoxFlag_DrawBackground|UI_BoxFlag_Clickable|UI_BoxFlag_DrawHotEffects, string); UI_Signal sig = ui_signal_from_box(box); return sig; @@ -847,7 +844,6 @@ internal UI_Signal rd_cmd_spec_button(String8 name) { RD_CmdKindInfo *info = rd_cmd_kind_info_from_string(name); - ui_set_next_hover_cursor(OS_Cursor_HandPoint); ui_set_next_child_layout_axis(Axis2_X); UI_Box *box = ui_build_box_from_stringf(UI_BoxFlag_DrawBorder| UI_BoxFlag_DrawBackground| @@ -914,7 +910,6 @@ internal UI_Signal rd_icon_button(RD_IconKind kind, FuzzyMatchRangeList *matches, String8 string) { String8 display_string = ui_display_part_from_key_string(string); - ui_set_next_hover_cursor(OS_Cursor_HandPoint); ui_set_next_child_layout_axis(Axis2_X); UI_Box *box = ui_build_box_from_string(UI_BoxFlag_Clickable| UI_BoxFlag_DrawBorder| @@ -1609,7 +1604,6 @@ rd_code_slice(RD_CodeSliceParams *params, TxtPt *cursor, TxtPt *mark, S64 *prefe ui_set_next_font(rd_font_from_slot(RD_FontSlot_Icons)); ui_set_next_font_size(params->font_size * 1.f); ui_set_next_text_raster_flags(FNT_RasterFlag_Smooth); - ui_set_next_hover_cursor(OS_Cursor_HandPoint); ui_set_next_text_alignment(UI_TextAlign_Center); ui_set_next_text_color(bp_rgba); UI_Box *bp_box = ui_build_box_from_stringf(UI_BoxFlag_DrawText| @@ -1669,7 +1663,6 @@ rd_code_slice(RD_CodeSliceParams *params, TxtPt *cursor, TxtPt *mark, S64 *prefe ui_set_next_font(rd_font_from_slot(RD_FontSlot_Icons)); ui_set_next_font_size(params->font_size * 1.f); ui_set_next_text_raster_flags(FNT_RasterFlag_Smooth); - ui_set_next_hover_cursor(OS_Cursor_HandPoint); ui_set_next_text_alignment(UI_TextAlign_Center); ui_set_next_text_color(color); UI_Box *pin_box = ui_build_box_from_stringf(UI_BoxFlag_DrawText| @@ -3099,10 +3092,6 @@ rd_cell(RD_CellParams *params, String8 string) { ui_set_next_hover_cursor(OS_Cursor_IBar); } - if(params->flags & RD_CellFlag_Button) - { - ui_set_next_hover_cursor(OS_Cursor_HandPoint); - } UI_Box *box = ui_build_box_from_key(UI_BoxFlag_MouseClickable| (!!(params->flags & RD_CellFlag_KeyboardClickable)*UI_BoxFlag_KeyboardClickable)| UI_BoxFlag_ClickToFocus| @@ -3184,7 +3173,6 @@ rd_cell(RD_CellParams *params, String8 string) UI_CornerRadius(floor_f32(height_px/2.f - 1.f)) UI_TagF(is_toggled ? "good_pop" : "") { - ui_set_next_hover_cursor(OS_Cursor_HandPoint); UI_Box *switch_box = ui_build_box_from_stringf(UI_BoxFlag_DrawHotEffects|UI_BoxFlag_DrawBorder|UI_BoxFlag_DrawBackground|UI_BoxFlag_Clickable, "toggle_switch"); UI_Parent(switch_box) { diff --git a/src/ui/ui_basic_widgets.c b/src/ui/ui_basic_widgets.c index 09cf9a42..12e86b0f 100644 --- a/src/ui/ui_basic_widgets.c +++ b/src/ui/ui_basic_widgets.c @@ -70,7 +70,6 @@ ui_label_multilinef(F32 max, char *fmt, ...) internal UI_Signal ui_button(String8 string) { - ui_set_next_hover_cursor(OS_Cursor_HandPoint); UI_Box *box = ui_build_box_from_string(UI_BoxFlag_Clickable| UI_BoxFlag_DrawBackground| UI_BoxFlag_DrawBorder| @@ -181,7 +180,7 @@ ui_line_edit(TxtPt *cursor, TxtPt *mark, U8 *edit_buffer, U64 edit_buffer_size, B32 is_focus_active_disabled = (!is_focus_active && ui_top_focus_active() == UI_FocusKind_On); //- rjf: build top-level box - ui_set_next_hover_cursor(is_focus_active ? OS_Cursor_IBar : OS_Cursor_HandPoint); + ui_set_next_hover_cursor(is_focus_active ? OS_Cursor_IBar : OS_Cursor_Pointer); UI_Box *box = ui_build_box_from_key(UI_BoxFlag_DrawBackground| UI_BoxFlag_DrawBorder| UI_BoxFlag_MouseClickable| @@ -1258,7 +1257,6 @@ ui_scroll_bar(Axis2 axis, UI_Size off_axis_size, UI_ScrollPt pt, Rng1S64 idx_ran if(idx_range.max != idx_range.min) { ui_set_next_pref_size(axis, ui_pct((F32)((F64)(pt.idx-idx_range.min)/(F64)idx_range_dim), 0)); - ui_set_next_hover_cursor(OS_Cursor_HandPoint); UI_Box *space_before_box = ui_build_box_from_stringf(UI_BoxFlag_Clickable, "##scroll_area_before"); space_before_sig = ui_signal_from_box(space_before_box); } @@ -1274,7 +1272,6 @@ ui_scroll_bar(Axis2 axis, UI_Size off_axis_size, UI_ScrollPt pt, Rng1S64 idx_ran if(idx_range.max != idx_range.min) { ui_set_next_pref_size(axis, ui_pct(1.f - (F32)((F64)(pt.idx-idx_range.min)/(F64)idx_range_dim), 0)); - ui_set_next_hover_cursor(OS_Cursor_HandPoint); UI_Box *space_after_box = ui_build_box_from_stringf(UI_BoxFlag_Clickable, "##scroll_area_after"); space_after_sig = ui_signal_from_box(space_after_box); }