From 59bbcee373931db6c836931a4af4efc9b72726f4 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Fri, 30 Mar 2012 10:14:05 +0000 Subject: [PATCH] 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 --- programs/fs/Eolite/trunk/Eolite.c-- | 1 - programs/fs/Eolite/trunk/lib/kolibri.h-- | 9 +++++++-- programs/network/htmlv/lib/kolibri.h-- | 6 +++++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/programs/fs/Eolite/trunk/Eolite.c-- b/programs/fs/Eolite/trunk/Eolite.c-- index 47ae88bbb6..17fa76ecea 100644 --- a/programs/fs/Eolite/trunk/Eolite.c-- +++ b/programs/fs/Eolite/trunk/Eolite.c-- @@ -524,7 +524,6 @@ void Line_ReDraw(dword color, filenum){ y=filenum*BUTTON_HEIGHT+57; //положение текста по Y IF (rename_active==1) ReName(false); //да, я не спорю что изврат, но перерисовка зато маленькая - DeleteButton(201+filenum); 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+19,y,onLeft(46,192),BUTTON_HEIGHT,color); DrawBar(195,y+17,16,1,color); diff --git a/programs/fs/Eolite/trunk/lib/kolibri.h-- b/programs/fs/Eolite/trunk/lib/kolibri.h-- index 7793c7bf96..63285709e0 100644 --- a/programs/fs/Eolite/trunk/lib/kolibri.h-- +++ b/programs/fs/Eolite/trunk/lib/kolibri.h-- @@ -299,10 +299,15 @@ inline fastcall void PutPixel(dword EBX,ECX,EDX){ $int 0x40 } -void DefineButton(dword x,y,w,h,EDX,ESI){ - EAX = 8; +void DefineButton(dword x,y,w,h,EDX,ESI) +{ + EAX = 8; + $push edx + EDX += BT_DEL; //вначале удаляем кнопу с эти ид, потом создаём + $int 0x40; EBX = x<<16+w; ECX = y<<16+h; + $pop edx $int 0x40 } diff --git a/programs/network/htmlv/lib/kolibri.h-- b/programs/network/htmlv/lib/kolibri.h-- index fe1fc9c493..7fe8cbdfea 100644 --- a/programs/network/htmlv/lib/kolibri.h-- +++ b/programs/network/htmlv/lib/kolibri.h-- @@ -587,9 +587,13 @@ void DrawBar(dword x,y,w,h,EDX) void DefineButton(dword x,y,w,h,EDX,ESI) { EAX = 8; + $push edx + EDX += BT_DEL; //вначале удаляем кнопу с эти ид, потом создаём + $int 0x40; EBX = x<<16+w; ECX = y<<16+h; - $int 0x40 + $pop edx + $int 0x40 } inline fastcall void DeleteButton(dword EDX)