From 2151ff8b28f0f6658fca7a22ffbbc2da0d7682ef Mon Sep 17 00:00:00 2001 From: Allen Webster Date: Fri, 27 Nov 2020 09:52:44 -0800 Subject: [PATCH] Whoops; transition last integer type over to new config system --- custom/4coder_config.cpp | 6 +----- custom/4coder_config.h | 2 -- custom/generated/command_metadata.h | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/custom/4coder_config.cpp b/custom/4coder_config.cpp index 20a30a2f..cf4ac611 100644 --- a/custom/4coder_config.cpp +++ b/custom/4coder_config.cpp @@ -1368,8 +1368,6 @@ config_init_default(Config_Data *config){ config->cursor_roundness = .45f; config->mark_thickness = 2.f; config->lister_roundness = .20f; - - config->default_font_size = 16; } function Config* @@ -1395,8 +1393,6 @@ config_parse__data(Application_Links *app, Arena *arena, String_Const_u8 file_na config->lister_roundness = ((f32)x)*0.01f; } } - - config_int_var(parsed, "default_font_size", 0, &config->default_font_size); } if (!success){ @@ -1584,7 +1580,7 @@ load_config_and_apply(Application_Links *app, Arena *out_arena, Config_Data *con description.parameters.pt_size = override_font_size; } else{ - description.parameters.pt_size = config->default_font_size; + description.parameters.pt_size = (i32)def_get_config_u64(app, vars_save_string_lit("default_font_size")); } b32 default_font_hinting = def_get_config_b32(vars_save_string_lit("default_font_hinting")); diff --git a/custom/4coder_config.h b/custom/4coder_config.h index 38785d04..c490fbea 100644 --- a/custom/4coder_config.h +++ b/custom/4coder_config.h @@ -181,8 +181,6 @@ struct Config_Data{ f32 cursor_roundness; f32 mark_thickness; f32 lister_roundness; - - i32 default_font_size; }; //////////////////////////////// diff --git a/custom/generated/command_metadata.h b/custom/generated/command_metadata.h index aa7f7746..8f2340ed 100644 --- a/custom/generated/command_metadata.h +++ b/custom/generated/command_metadata.h @@ -372,7 +372,7 @@ static Command_Metadata fcoder_metacmd_table[250] = { { PROC_LINKS(list_all_substring_locations, 0), false, "list_all_substring_locations", 28, "Queries the user for a string and lists all case-sensitive substring matches found in all open buffers.", 103, "W:\\4ed\\code\\custom\\4coder_search.cpp", 36, 174 }, { PROC_LINKS(list_all_substring_locations_case_insensitive, 0), false, "list_all_substring_locations_case_insensitive", 45, "Queries the user for a string and lists all case-insensitive substring matches found in all open buffers.", 105, "W:\\4ed\\code\\custom\\4coder_search.cpp", 36, 186 }, { PROC_LINKS(load_project, 0), false, "load_project", 12, "Looks for a project.4coder file in the current directory and tries to load it. Looks in parent directories until a project file is found or there are no more parents.", 167, "W:\\4ed\\code\\custom\\4coder_project_commands.cpp", 46, 972 }, -{ PROC_LINKS(load_theme_current_buffer, 0), false, "load_theme_current_buffer", 25, "Parse the current buffer as a theme file and add the theme to the theme list. If the buffer has a .4coder postfix in it's name, it is removed when the name is saved.", 165, "W:\\4ed\\code\\custom\\4coder_config.cpp", 36, 1625 }, +{ PROC_LINKS(load_theme_current_buffer, 0), false, "load_theme_current_buffer", 25, "Parse the current buffer as a theme file and add the theme to the theme list. If the buffer has a .4coder postfix in it's name, it is removed when the name is saved.", 165, "W:\\4ed\\code\\custom\\4coder_config.cpp", 36, 1621 }, { PROC_LINKS(load_themes_default_folder, 0), false, "load_themes_default_folder", 26, "Loads all the theme files in the default theme folder.", 54, "W:\\4ed\\code\\custom\\4coder_default_framework.cpp", 47, 535 }, { PROC_LINKS(load_themes_hot_directory, 0), false, "load_themes_hot_directory", 25, "Loads all the theme files in the current hot directory.", 55, "W:\\4ed\\code\\custom\\4coder_default_framework.cpp", 47, 547 }, { PROC_LINKS(make_directory_query, 0), false, "make_directory_query", 20, "Queries the user for a name and creates a new directory with the given name.", 76, "W:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 1495 },