Eolite: inproperly operate the buttons in the delete dialog - fix 2

git-svn-id: svn://kolibrios.org@6300 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Serhii Sakhno 2016-03-02 17:44:25 +00:00
parent a882bbbafc
commit 52d53bf71f
3 changed files with 4 additions and 4 deletions

View File

@ -337,9 +337,8 @@ void main()
case 100...120: case 100...120:
SystemDiscs.Click(id-100); SystemDiscs.Click(id-100);
break; break;
case POPUP_BTN1: case POPUP_BTN1...POPUP_BTN2:
case POPUP_BTN2: if (del_active) Del_File(id-POPUP_BTN2);
if (del_active) Del_File(id-POPUP_BTN1);
if (new_element_active) NewElement(id-POPUP_BTN2); if (new_element_active) NewElement(id-POPUP_BTN2);
DeleteButton(POPUP_BTN1); DeleteButton(POPUP_BTN1);
DeleteButton(POPUP_BTN2); DeleteButton(POPUP_BTN2);

View File

@ -43,7 +43,7 @@ void about_dialog()
WriteTextB(about_x+2,107,0x82,0xD49CD2,ABOUT_TITLE); WriteTextB(about_x+2,107,0x82,0xD49CD2,ABOUT_TITLE);
WriteTextB(about_x,105,0x82,0x9D129D,ABOUT_TITLE); WriteTextB(about_x,105,0x82,0x9D129D,ABOUT_TITLE);
DrawRectangle3D(0,154,about_form.cwidth,1,system.color.work_dark,system.color.work_light); DrawRectangle3D(0,154,about_form.cwidth,1,system.color.work_dark,system.color.work_light);
WriteTextLines(7,163,0x90,system.color.work_text,"KolibriOS File Manager\nAuthors: Leency, Veliant\nPunkJoker, Pavelyakov\n(c) 2008 - 2016",20); WriteTextLines(7,163,0x90,system.color.work_text,"KolibriOS File Manager\nAuthors: Leency, Veliant\nPunk_Joker, Pavelyakov\n(c) 2008 - 2016",20);
#ifdef LANG_RUS #ifdef LANG_RUS
DrawFlatButton(about_form.cwidth-180/2,about_form.cheight-38,180,26,11,"ˆáâ®à¨ï ࠧࠡ®âª¨"); DrawFlatButton(about_form.cwidth-180/2,about_form.cheight-38,180,26,11,"ˆáâ®à¨ï ࠧࠡ®âª¨");
#endif #endif

View File

@ -81,6 +81,7 @@ void Del_File_Thread()
void Del_File(byte dodel) { void Del_File(byte dodel) {
del_active=0; del_active=0;
debugi(dodel);
if (dodel) if (dodel)
{ {
delete_stak = malloc(40000); delete_stak = malloc(40000);