diff --git a/4coder_default_bindings.cpp b/4coder_default_bindings.cpp index 9345f768..8111b81d 100644 --- a/4coder_default_bindings.cpp +++ b/4coder_default_bindings.cpp @@ -299,8 +299,8 @@ default_keys(Bind_Helper *context){ bind(context, 'M', MDFR_ALT, build_at_launch_location); end_map(context); - - + + begin_map(context, my_html_map); inherit_map(context, mapid_file); bind(context, 'h', MDFR_ALT, write_h); diff --git a/4ed.cpp b/4ed.cpp index 2435fa0f..4e15bea3 100644 --- a/4ed.cpp +++ b/4ed.cpp @@ -4073,40 +4073,40 @@ App_Step_Sig(app_step){ consume_input(&available_input, Input_Esc); } } - + update_command_data(vars, cmd); - + // NOTE(allen): initialize message if (first_step){ - String welcome = make_lit_string( - "Welcome to " VERSION "\n" - "If you're new to 4coder there's no tutorial yet :(\n" - "you can use the key combo control + o to look for a file\n" - "and if you load README.txt you'll find all the key combos there are.\n" - "\n" - "Newest features:\n" - "-Tied the view scrolling and the list arrow navigation together\n" - "-Scroll bars are now toggleable with ALT-s for show and ALT-w for hide\n" - "\n" - "New in alpha 4.0.5:" - "-New indent rule\n" - "-app->buffer_compute_cursor in the customization API\n" - "-f keys are available\n" - "\n" - "New in alpha 4.0.3 and 4.0.4:\n" - "-Scroll bar on files and file lists\n" - "-Arrow navigation in lists\n" - "-A new minimal theme editor\n" - "\n" - "New in alpha 4.0.2:\n" - "-The file count limit is over 8 million now\n" - "-File equality is handled better so renamings (such as 'subst') are safe now\n" - "-This buffer will report events including errors that happen in 4coder\n" - "-Super users can post their own messages here with app->print_message\n" - "- centers view on cursor; cmdid_center_view in customization API\n" - "-Set font size on command line with -f N, N = 16 by default\n\n" - ); - + String welcome = + make_lit_string("Welcome to " VERSION "\n" + "If you're new to 4coder there's no tutorial yet :(\n" + "you can use the key combo control + o to look for a file\n" + "and if you load README.txt you'll find all the key combos there are.\n" + "\n" + "Newest features:\n" + "-Tied the view scrolling and the list arrow navigation together\n" + "-Scroll bars are now toggleable with ALT-s for show and ALT-w for hide\n" + "\n" + "New in alpha 4.0.5:\n" + "-New indent rule\n" + "-app->buffer_compute_cursor in the customization API\n" + "-f keys are available\n" + "\n" + "New in alpha 4.0.3 and 4.0.4:\n" + "-Scroll bar on files and file lists\n" + "-Arrow navigation in lists\n" + "-A new minimal theme editor\n" + "\n" + "New in alpha 4.0.2:\n" + "-The file count limit is over 8 million now\n" + "-File equality is handled better so renamings (such as 'subst') are safe now\n" + "-This buffer will report events including errors that happen in 4coder\n" + "-Super users can post their own messages here with app->print_message\n" + "- centers view on cursor; cmdid_center_view in customization API\n" + "-Set font size on command line with -f N, N = 16 by default\n\n" + ); + do_feedback_message(system, models, welcome); } @@ -4574,9 +4574,9 @@ App_Step_Sig(app_step){ gui_post_scroll_vars(&view->gui_target, view->current_scroll); break; } + + view_record_prev_cursor(view); } - - view_record_prev_cursor(view); } // NOTE(allen): send style change messages if the style has changed diff --git a/4ed_file_view.cpp b/4ed_file_view.cpp index ea13c839..d1da58df 100644 --- a/4ed_file_view.cpp +++ b/4ed_file_view.cpp @@ -4217,7 +4217,7 @@ do_input_file_view(System_Functions *system, Exchange *exchange, gui_session.rect.y0); f32 new_max_y = view_compute_max_target_y(view); - view->file_region = view->scroll_region; + view->file_region = gui_session.rect; view->gui_target.scroll_updated.min_y = new_min_y; view->gui_target.scroll_updated.max_y = new_max_y;