correction kolibri.h-- for DefineButton. It defines only after deletion previous button with this ID.

git-svn-id: svn://kolibrios.org@2528 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2012-03-30 10:14:05 +00:00
parent c239c2aef6
commit 59bbcee373
3 changed files with 12 additions and 4 deletions

View File

@ -524,7 +524,6 @@ void Line_ReDraw(dword color, filenum){
y=filenum*BUTTON_HEIGHT+57; //ïîëîæåíèå òåêñòà ïî Y y=filenum*BUTTON_HEIGHT+57; //ïîëîæåíèå òåêñòà ïî Y
IF (rename_active==1) ReName(false); IF (rename_active==1) ReName(false);
//äà, ÿ íå ñïîðþ ÷òî èçâðàò, íî ïåðåðèñîâêà çàòî ìàëåíüêàÿ //äà, ÿ íå ñïîðþ ÷òî èçâðàò, íî ïåðåðèñîâêà çàòî ìàëåíüêàÿ
DeleteButton(201+filenum);
DefineButton(192,y,onLeft(28,192),BUTTON_HEIGHT,201+filenum+BT_HIDE+BT_NOFRAME,color); //êíîïà DefineButton(192,y,onLeft(28,192),BUTTON_HEIGHT,201+filenum+BT_HIDE+BT_NOFRAME,color); //êíîïà
DrawBar(192,y,3,BUTTON_HEIGHT,color); DrawBar(195,y,16,2,color); DrawBar(192,y,3,BUTTON_HEIGHT,color); DrawBar(195,y,16,2,color);
DrawBar(192+19,y,onLeft(46,192),BUTTON_HEIGHT,color); DrawBar(195,y+17,16,1,color); DrawBar(192+19,y,onLeft(46,192),BUTTON_HEIGHT,color); DrawBar(195,y+17,16,1,color);

View File

@ -299,10 +299,15 @@ inline fastcall void PutPixel(dword EBX,ECX,EDX){
$int 0x40 $int 0x40
} }
void DefineButton(dword x,y,w,h,EDX,ESI){ void DefineButton(dword x,y,w,h,EDX,ESI)
{
EAX = 8; EAX = 8;
$push edx
EDX += BT_DEL; //âíà÷àëå óäàëÿåì êíîïó ñ ýòè èä, ïîòîì ñîçäà¸ì
$int 0x40;
EBX = x<<16+w; EBX = x<<16+w;
ECX = y<<16+h; ECX = y<<16+h;
$pop edx
$int 0x40 $int 0x40
} }

View File

@ -587,8 +587,12 @@ void DrawBar(dword x,y,w,h,EDX)
void DefineButton(dword x,y,w,h,EDX,ESI) void DefineButton(dword x,y,w,h,EDX,ESI)
{ {
EAX = 8; EAX = 8;
$push edx
EDX += BT_DEL; //âíà÷àëå óäàëÿåì êíîïó ñ ýòè èä, ïîòîì ñîçäà¸ì
$int 0x40;
EBX = x<<16+w; EBX = x<<16+w;
ECX = y<<16+h; ECX = y<<16+h;
$pop edx
$int 0x40 $int 0x40
} }