From 00482424524e1eaef10a288fda886c2fa12f0f4d Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Mon, 14 Nov 2016 00:42:32 +0000 Subject: [PATCH] cmm: various fixes git-svn-id: svn://kolibrios.org@6708 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/cmm/eolite/include/progress_dialog.h | 2 +- programs/cmm/lib/gui.h | 2 +- programs/cmm/lib/patterns/restart_process.h | 6 ++++-- programs/cmm/process/process.c | 3 ++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/programs/cmm/eolite/include/progress_dialog.h b/programs/cmm/eolite/include/progress_dialog.h index 257e599b5f..cf3f863199 100644 --- a/programs/cmm/eolite/include/progress_dialog.h +++ b/programs/cmm/eolite/include/progress_dialog.h @@ -38,7 +38,7 @@ void DisplayOperationForm() DefineAndDrawWindow(Form.left+Form.width-200,Form.top+90,WIN_DIALOG_W,skin_height+WIN_DIALOG_H,0x34,system.color.work,title); GetProcessInfo(#Dialog_Form, SelfInfo); WriteText(45, 11, 0x90, system.color.work_text, message); - DrawFlatButton(Dialog_Form.cwidth - 96, /*Dialog_Form.cheight - 32*/ copy_bar.top , 80, 22, T_CANCEL_PASTE, T_ABORT_WINDOW_BUTTON); + DrawFlatButton(Dialog_Form.cwidth - 105, copy_bar.top-2 , T_CANCEL_PASTE, T_ABORT_WINDOW_BUTTON); } } diff --git a/programs/cmm/lib/gui.h b/programs/cmm/lib/gui.h index 5313d9d55e..e0f9083157 100644 --- a/programs/cmm/lib/gui.h +++ b/programs/cmm/lib/gui.h @@ -171,7 +171,7 @@ w = ESI.edit_box.width+1; if (ESI.edit_box.flags & 100000000000b) bg = 0xCACACA; else bg = 0xFFFfff; edit_box_draw stdcall (edit_box_pointer); - h = ESI.edit_box.ed_height+2; + h = 22; DrawRectangle(x-1, y-1, w+1, h+1, bg); DrawRectangle3D(x-2, y-2, w+3, h+3, 0xDDDddd, bg); DrawRectangle(x-3, y-3, w+5, h+5, system.color.work_graph); diff --git a/programs/cmm/lib/patterns/restart_process.h b/programs/cmm/lib/patterns/restart_process.h index 4a98c614f3..ded1a94c94 100644 --- a/programs/cmm/lib/patterns/restart_process.h +++ b/programs/cmm/lib/patterns/restart_process.h @@ -10,10 +10,12 @@ enum { SINGLE }; +#define MAX_PROCESS_COUNT 256 + :int CheckProcessExists(dword proc_name) { int i; proc_info Process; - for (i=0; i<1000; i++;) + for (i=0; i