Egor00f/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

bugfix previous revision

Browse Source 
git-svn-id: svn://kolibrios.org@1326 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Alexey Teplov ( 2009-12-17 17:21:48 +00:00
parent 3ab8c8d48f
commit 9d75a9ca5e
1 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
kernel/trunk/gui/window.inc
View File

@ -366,12 +366,11 @@ display_settings:
.00: .00:
; redraw display ; redraw display
test ecx, ecx xor eax,eax
jnz .01 inc ebx
inc ecx cmp [windowtypechanged],dword ebx ;ebx=1
cmp [windowtypechanged],dword ecx ;ebx=1
jne .fail jne .fail
mov [windowtypechanged],dword ebx ;eax=0 mov [windowtypechanged],dword eax ;eax=0
.redraw_screen_direct: .redraw_screen_direct:
xor eax,eax xor eax,eax
mov [dlx],dword eax mov [dlx],dword eax
@ -381,8 +380,6 @@ display_settings:
mov eax,[Screen_Max_Y] mov eax,[Screen_Max_Y]
mov [dlye],eax mov [dlye],eax
mov eax,window_data mov eax,window_data
;maybe use jmp?
; call redrawscreen
jmp redrawscreen jmp redrawscreen
.fail: .fail:
ret ret
@ -400,9 +397,6 @@ display_settings:
; set common window colours ; set common window colours
dec ebx dec ebx
mov [windowtypechanged],dword ebx ;eax=1 mov [windowtypechanged],dword ebx ;eax=1
mov esi,[TASK_BASE]
add esi,TASKDATA.mem_start
add ecx,[esi]
mov esi,ecx mov esi,ecx
and edx,127 and edx,127
mov edi,common_colours mov edi,common_colours
@ -413,9 +407,6 @@ display_settings:
.03: .03:
; get common window colours ; get common window colours
mov esi,[TASK_BASE]
add esi,TASKDATA.mem_start
add ecx,[esi]
mov edi,ecx mov edi,ecx
and edx,127 and edx,127
mov esi,common_colours mov esi,common_colours
@ -442,25 +433,25 @@ display_settings:
.06: .06:
; set screen workarea ; set screen workarea
; pushad mov edi,dword[Screen_Max_X]
movsx eax,word[esp+16+2+12] ;ecx in the stack movsx eax,word[esp+28+2] ;ecx in the stack
movsx ebx,word[esp+16+12] movsx ebx,word[esp+28]
cmp eax,ebx cmp eax,ebx
jge .lp1 jge .lp1
or eax,eax;[Screen_Max_X] or eax,eax;[Screen_Max_X]
jl @f jl @f
mov [screen_workarea.left],eax mov [screen_workarea.left],eax
@@: cmp ebx,[Screen_Max_X] @@: cmp ebx,edi ;[Screen_Max_X]
jg .lp1 jg .lp1
mov [screen_workarea.right],ebx mov [screen_workarea.right],ebx
.lp1: movsx eax,word[esp+24+2] ;edx in the stack .lp1: movsx eax,word[esp+24+2] ;edx in the stack
movsx ebx,word[esp+24] movsx ebx,word[esp+24]
cmp eax,ebx cmp eax,ebx
jge .lp2 jge .lp2
or eax,eax;[0xFE04] or eax,eax;[0xFE04]
jl @f jl @f
mov [screen_workarea.top],eax mov [screen_workarea.top],eax
@@: cmp ebx,[Screen_Max_Y] @@: cmp ebx,edi ;[Screen_Max_Y]
jg .lp2 jg .lp2
mov [screen_workarea.bottom],ebx mov [screen_workarea.bottom],ebx
.lp2: call repos_windows .lp2: call repos_windows
@ -468,12 +459,7 @@ display_settings:
xor ebx, ebx xor ebx, ebx
mov ecx, [Screen_Max_X] mov ecx, [Screen_Max_X]
mov edx, [Screen_Max_Y] mov edx, [Screen_Max_Y]
; call calculatescreen
jmp calculatescreen jmp calculatescreen
; jmp redraw_screen_direct
; .exit:
; popad
; ret
.07: .07:
; get skin margins ; get skin margins