diff --git a/src/df/gfx/df_gfx.c b/src/df/gfx/df_gfx.c index e334b6bf..f6cad045 100644 --- a/src/df/gfx/df_gfx.c +++ b/src/df/gfx/df_gfx.c @@ -3825,13 +3825,6 @@ df_window_update_and_render(Arena *arena, OS_EventList *events, DF_Window *ws, D { UI_CornerRadius00(ui_top_font_size()*0.25f) UI_CornerRadius01(ui_top_font_size()*0.25f) - if(ui_clicked(ui_buttonf("Cancel")) || os_key_press(ui_events(), ui_window(), 0, OS_Key_Esc)) - { - DF_CmdParams p = df_cmd_params_zero(); - df_push_cmd__root(&p, df_cmd_spec_from_core_cmd_kind(DF_CoreCmdKind_ConfirmCancel)); - } - UI_CornerRadius10(ui_top_font_size()*0.25f) - UI_CornerRadius11(ui_top_font_size()*0.25f) UI_BackgroundColor(df_rgba_from_theme_color(DF_ThemeColor_ActionBackground)) UI_TextColor(df_rgba_from_theme_color(DF_ThemeColor_ActionText)) UI_BorderColor(df_rgba_from_theme_color(DF_ThemeColor_ActionBorder)) @@ -3840,6 +3833,13 @@ df_window_update_and_render(Arena *arena, OS_EventList *events, DF_Window *ws, D DF_CmdParams p = df_cmd_params_zero(); df_push_cmd__root(&p, df_cmd_spec_from_core_cmd_kind(DF_CoreCmdKind_ConfirmAccept)); } + UI_CornerRadius10(ui_top_font_size()*0.25f) + UI_CornerRadius11(ui_top_font_size()*0.25f) + if(ui_clicked(ui_buttonf("Cancel")) || os_key_press(ui_events(), ui_window(), 0, OS_Key_Esc)) + { + DF_CmdParams p = df_cmd_params_zero(); + df_push_cmd__root(&p, df_cmd_spec_from_core_cmd_kind(DF_CoreCmdKind_ConfirmCancel)); + } } ui_spacer(ui_em(3.f, 1.f)); }