From 748fe8669e1fe10858360ebdc9361a44daaf3c8a Mon Sep 17 00:00:00 2001 From: andrew_programmer Date: Sun, 16 Dec 2007 15:02:15 +0000 Subject: [PATCH] Mistakes in controls are corrected: ProgressBar, Text, Image. git-svn-id: svn://kolibrios.org@682 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/develop/libGUI/src/image.inc | 6 ++++++ programs/develop/libGUI/src/progress_bar.inc | 11 +++++++++++ programs/develop/libGUI/src/text.inc | 6 ++++++ programs/develop/libGUI/src/version.inc | 16 ++++++++++++++++ programs/develop/libGUI/whats new.txt | 10 ++++++++++ 5 files changed, 49 insertions(+) create mode 100644 programs/develop/libGUI/src/version.inc diff --git a/programs/develop/libGUI/src/image.inc b/programs/develop/libGUI/src/image.inc index c6b1832ff1..30d8dc19a2 100644 --- a/programs/develop/libGUI/src/image.inc +++ b/programs/develop/libGUI/src/image.inc @@ -137,4 +137,10 @@ image: exit_image: + mov edi,[PointerForImage] + add edi,control_header_size + mov esi,dword Image + mov ecx,im_control_data_size + rep movsb + ret 8 diff --git a/programs/develop/libGUI/src/progress_bar.inc b/programs/develop/libGUI/src/progress_bar.inc index 88ef34449c..f0bca896fa 100644 --- a/programs/develop/libGUI/src/progress_bar.inc +++ b/programs/develop/libGUI/src/progress_bar.inc @@ -117,6 +117,11 @@ progress_bar: and [ProgressBar.type],deactivate_trap + cmp [ProgressBar.progress],dword 0.02 + jae nofull_redraw + call draw_all_progress_bar + nofull_redraw: + call draw_progress no_draw_progress_bar: @@ -141,6 +146,12 @@ progress_bar: exit_progress_bar: + mov edi,[PointerForProgressBar] + add edi,control_header_size + mov esi,dword ProgressBar + mov ecx,pb_control_data_size + rep movsb + ret 8 draw_all_progress_bar: diff --git a/programs/develop/libGUI/src/text.inc b/programs/develop/libGUI/src/text.inc index 0cd73a3c12..8b0695b74d 100644 --- a/programs/develop/libGUI/src/text.inc +++ b/programs/develop/libGUI/src/text.inc @@ -160,4 +160,10 @@ text: exit_text: + mov edi,[PointerForText] + add edi,control_header_size + mov esi,dword Text + mov ecx,tx_control_data_size + rep movsb + ret 8 diff --git a/programs/develop/libGUI/src/version.inc b/programs/develop/libGUI/src/version.inc new file mode 100644 index 0000000000..463ae7b04d --- /dev/null +++ b/programs/develop/libGUI/src/version.inc @@ -0,0 +1,16 @@ +;**************************************************** +;****************get version of library************** +;**************************************************** +;IN +;not +;OUT +;version of library +;fersion format year:mouth:day +align 4 + +get_version: + + xor eax,eax + mov eax,dword 071216 ;16.12.07 + + ret \ No newline at end of file diff --git a/programs/develop/libGUI/whats new.txt b/programs/develop/libGUI/whats new.txt index 7c328d11ac..722abc667a 100644 --- a/programs/develop/libGUI/whats new.txt +++ b/programs/develop/libGUI/whats new.txt @@ -1,3 +1,13 @@ +16.12.07 + +RUSSIAN + +Исправлены ошибки в контролах: ProgressBar, Text, Image. + +ENGLISH + +Mistakes in controls are corrected: ProgressBar, Text, Image. + 28.11.07 RUSSIAN