ps
/
4coder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug fix, license update

This commit is contained in:
Allen Webster 2016-06-24 12:38:52 -04:00
parent 1564ade4b0
commit 24d1324f72
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
4ed_api_implementation.cpp
View File

@ -1269,14 +1269,19 @@ DOC_SEE(Set_Buffer_Flag)
return(result); return(result);
} }
VIEW_POST_FADE_SIG(external_view_post_fade){ VIEW_POST_FADE_SIG(external_view_post_fade)/*
DOC_PARAM(view, the veiw to post a fade effect to)
DOC_PARAM(seconds, the number of seconds the fade effect should last)
DOC_PARAM(start, the first character in the fade range)
DOC_PARAM(end, one after the last character in the fade range)
DOC_PARAM(color, the color to fade from)
*/{
Command_Data *cmd = (Command_Data*)app->cmd_context; Command_Data *cmd = (Command_Data*)app->cmd_context;
View *vptr = imp_get_view(cmd, view); View *vptr = imp_get_view(cmd, view);
int result = false; int result = false;
int size = end - start; int size = end - start;
if (vptr){ if (vptr){
if (size > 0){ if (size > 0){
result = true; result = true;

12
4ed_file_view.cpp
View File

@ -3288,9 +3288,11 @@ kill_file(System_Functions *system, Models *models,
} }
} }
internal void internal b32
try_kill_file(System_Functions *system, Models *models, try_kill_file(System_Functions *system, Models *models,
Editing_File *file, View *view, String string){ Editing_File *file, View *view, String string){
b32 kill_dialogue = false;
Working_Set *working_set = &models->working_set; Working_Set *working_set = &models->working_set;
if (!file && string.str){ if (!file && string.str){
@ -3309,11 +3311,14 @@ try_kill_file(System_Functions *system, Models *models,
IAct_Sure_To_Kill, IInt_Sure_To_Kill, IAct_Sure_To_Kill, IInt_Sure_To_Kill,
make_lit_string("Are you sure?")); make_lit_string("Are you sure?"));
copy(&view->dest, file->name.live_name); copy(&view->dest, file->name.live_name);
kill_dialogue = true;
} }
else{ else{
kill_file(system, models, file, string_zero()); kill_file(system, models, file, string_zero());
} }
} }
return(kill_dialogue);
} }
internal void internal void
@ -3358,8 +3363,9 @@ interactive_view_complete(System_Functions *system, View *view, String dest, i32
break; break;
case IAct_Kill: case IAct_Kill:
try_kill_file(system, models, 0, 0, dest); if (!try_kill_file(system, models, 0, 0, dest)){
view_show_file(view); view_show_file(view);
}
break; break;
case IAct_Sure_To_Close: case IAct_Sure_To_Close:

2
build_all.bat
View File

@ -23,7 +23,7 @@ popd
pushd ..\build pushd ..\build
REM call "..\code\buildsuper.bat" ..\code\4coder_default_bindings.cpp REM call "..\code\buildsuper.bat" ..\code\4coder_default_bindings.cpp
REM call "..\code\buildsuper.bat" ..\code\power\4coder_experiments.cpp call "..\code\buildsuper.bat" ..\code\power\4coder_experiments.cpp
REM call "..\code\buildsuper.bat" ..\code\power\4coder_casey.cpp REM call "..\code\buildsuper.bat" ..\code\power\4coder_casey.cpp
REM call "..\code\buildsuper.bat" ..\4vim\4coder_chronal.cpp REM call "..\code\buildsuper.bat" ..\4vim\4coder_chronal.cpp
if %ERRORLEVEL% neq 0 (set FirstError=1) if %ERRORLEVEL% neq 0 (set FirstError=1)