mr4th-public
/
4coder
1
Fork 0
Code Issues Releases Activity

new gray dark theme

master
Allen Webster 2017-02-23 16:47:08 -05:00
parent fdbb33b10b
commit 5ceacd914d
3 changed files with 44 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
4ed.cpp
View File

@ -836,6 +836,45 @@ app_hardcode_styles(Models *models){
style->main.file_info_style = file_info_style; style->main.file_info_style = file_info_style;
++style; ++style;
/////////////////
style_set_name(style, make_lit_string("stb dark"));
style->main.back_color = 0xFF303030;
style->main.margin_color = 0xFF383838;
style->main.margin_hover_color = 0xFF404040;
style->main.margin_active_color = 0xFF484848;
style->main.cursor_color = 0xFFDDDDDD;
style->main.at_cursor_color = 0xFF303030;
style->main.mark_color = 0xFF808080;
style->main.highlight_color = 0xFF006080;
style->main.at_highlight_color = 0xFF303030;
style->main.default_color = 0xFFAAAAAA;
style->main.comment_color = 0xFF6AC000;
style->main.keyword_color = 0xFFAAAAAA;
style->main.str_constant_color = 0xFFAAAAAA;
style->main.char_constant_color = style->main.str_constant_color;
style->main.int_constant_color = style->main.str_constant_color;
style->main.float_constant_color = style->main.str_constant_color;
style->main.bool_constant_color = style->main.str_constant_color;
style->main.include_color = style->main.str_constant_color;
style->main.preproc_color = style->main.default_color;
style->main.special_character_color = 0xFFFF0000;
style->main.ghost_character_color = color_blend(style->main.default_color, 0.5f, style->main.back_color);
style->main.paste_color = 0xFF00FFFF;
style->main.undo_color = 0xFFFF00FF;
style->main.highlight_junk_color = 0xFF482020;
style->main.highlight_white_color = 0xFF383838;
file_info_style.bar_color = 0xFF606060;
file_info_style.bar_active_color = 0xFF3E3E3E;
file_info_style.base_color = 0xFF000000;
file_info_style.pop1_color = 0xFF00B0D0;
file_info_style.pop2_color = 0xFFFF3A00;
style->main.file_info_style = file_info_style;
++style;
///////////////// /////////////////
style_set_name(style, make_lit_string("Hjortshoej")); style_set_name(style, make_lit_string("Hjortshoej"));

21
4ed_file_view.cpp
View File

@ -4318,16 +4318,6 @@ get_exhaustive_info(System_Functions *system, Working_Set *working_set, Exhausti
Editing_File *file = working_set_canon_contains(working_set, loop->full_path); Editing_File *file = working_set_canon_contains(working_set, loop->full_path);
#if 0
if (file != 0){
Editing_File_Canon_Name canon_name;
if (get_canon_name(system, &canon_name, loop->full_path)){
file = working_set_canon_contains(working_set, canon_name.name);
}
}
#endif
String filename = make_string_cap(result.info->filename, result.info->filename_len, result.info->filename_len+1); String filename = make_string_cap(result.info->filename, result.info->filename_len, result.info->filename_len+1);
result.is_folder = (result.info->folder != 0); result.is_folder = (result.info->folder != 0);
@ -5050,12 +5040,11 @@ step_file_view(System_Functions *system, View *view, View *active_view, Input_Su
if (file_info.name_match){ if (file_info.name_match){
id.id[0] = (u64)(file_info.info); id.id[0] = (u64)(file_info.info);
String filename = make_string_cap(file_info.info->filename, char *str = file_info.info->filename;
file_info.info->filename_len, i32 len = file_info.info->filename_len;
file_info.info->filename_len+1); String filename = make_string_cap(str, len, len + 1);
if (gui_do_file_option(target, id, filename, if (gui_do_file_option(target, id, filename, file_info.is_folder, file_info.message)){
file_info.is_folder, file_info.message)){
if (file_info.is_folder){ if (file_info.is_folder){
set_last_folder_sc(&hdir->string, file_info.info->filename, '/'); set_last_folder_sc(&hdir->string, file_info.info->filename, '/');
do_new_directory = 1; do_new_directory = 1;
@ -6400,7 +6389,7 @@ draw_fat_option_block(GUI_Target *gui_target, Render_Target *target, View *view,
u32 margin = get_margin_color(active_level, style); u32 margin = get_margin_color(active_level, style);
u32 back = style->main.back_color; u32 back = style->main.back_color;
u32 text_color = style->main.default_color; u32 text_color = style->main.default_color;
u32 pop_color = style->main.special_character_color; u32 pop_color = style->main.file_info_style.pop2_color;
i32 h = view->line_height; i32 h = view->line_height;
i32 x = inner.x0 + 3; i32 x = inner.x0 + 3;

2
linux_4ed.cpp
View File

@ -1151,8 +1151,6 @@ flush_to_direct_queue(Unbounded_Work_Queue *source_queue, Work_Queue *queue, i32
} }
// NOTE(allen): platform dependent portion... // NOTE(allen): platform dependent portion...
// TODO(allen): pull out the duplicated part once I see
// that this is pretty much the same on linux.
for (i32 i = 0; i < semaphore_release_count; ++i){ for (i32 i = 0; i < semaphore_release_count; ++i){
sem_post(LinuxHandleToSem(queue->semaphore)); sem_post(LinuxHandleToSem(queue->semaphore));
} }