Subversion Repositories Kolibri OS

Rev

Rev 6352 | Rev 6358 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 6352 Rev 6357
Line 10... Line 10...
10 
	mov	ebx,[esi+38]
 10 
	mov	ebx,[esi+38]
11 
	mov	ecx,[esi+42]
 11 
	mov	ecx,[esi+42]
12 
	mov	edx,[esi+46]
 12 
	mov	edx,[esi+46]
13 
	mov	[Window_CordinatX],eax
 13 
	mov	[Window_CordinatX],eax
14 
	mov	[Window_CordinatY],ebx
 14 
	mov	[Window_CordinatY],ebx
15 
	mov	[Window_SizeX],ecx
 - 
 
16 
	mov	[Window_SizeY],edx
 - 
 
Line 17... Line 15...
17 
 
 15
18 
	cmp	[Window_SizeX],585
 16 
	cmp	ecx,585
19 
	jae	no_minimum_size_x
 - 
 
20 
 
 - 
 
21 
	mov	[Window_SizeX],585
 17 
	jae	@f
22 
	mov	ecx,[Window_SizeX]
 18 
		mov	ecx,585 ;minimum size x
23 
 
 - 
 
24 
no_minimum_size_x:
 19 
	@@:
- 
 
 20 
	cmp	[Window_SizeY],400
25 
	cmp	[Window_SizeY],400
 21 
	jae	@f
26 
	jae	no_minimum_size_y
 22 
		mov	edx,400 ;minimum size y
27 
 
 23 
	@@:
28 
	mov	[Window_SizeY],400
 24 
	mov	[Window_SizeX],ecx
Line 29... Line -...
29 
	mov	edx,[Window_SizeY]
 - 
 
30 
 
 25 
	mov [Window_SizeY],edx
31 
no_minimum_size_y:
 26 
 
32 
	mov	[MaxWorkScreen_SizeX],ecx
 27 
	mov	[MaxWorkScreen_SizeX],ecx
33 
	mov	[MaxWorkScreen_SizeY],edx
 28 
	mov	[MaxWorkScreen_SizeY],edx
Line 34... Line 29...
34 
	sub	[MaxWorkScreen_SizeX],20+10+5+10
 29 
	sub	[MaxWorkScreen_SizeX],ci_edit_wnd_x_pos+2*ci_edit_wnd_border+34
35 
	sub	[MaxWorkScreen_SizeY],20+10+15+1+49+20+10
 30 
	sub	[MaxWorkScreen_SizeY],ci_edit_wnd_y_pos+2*ci_edit_wnd_border+34
Line 36... Line 31...
36 
 
 31 
 
Line 86... Line 81...
86 
;------------------------------------------------
 81 
;------------------------------------------------
87 
	mov ecx,[k]
 82 
	mov ecx,[k]
88 
	call MovePictureToWorkScreen
 83 
	call MovePictureToWorkScreen
89 
;------------------------------------------------
 84 
;------------------------------------------------
90 
	mov	ebx,[WorkScreen_SizeX]
 85 
	mov	ebx,[WorkScreen_SizeX]
91 
	add	ebx,5+3
 - 
 
92 
	mov	edx,[Window_SizeX]
 86 
	add	ebx,ci_edit_wnd_x_pos+ci_edit_wnd_border
93 
	sub	edx,ebx
 - 
 
94 
	sub	edx,25+10-3
 - 
 
95 
	shl	ebx,16
 87 
	shl	ebx,16
96 
	mov	bx,dx
 88 
	mov	bx,ci_edit_wnd_border ;è¨à¨­  ¡®à¤îà 
Line 97... Line 89...
97
89
98 
	mov	ecx,20+15+1+49+2
 90 
	mov	ecx,ci_edit_wnd_y_pos+ci_edit_wnd_border
99 
	mov	edx,[Window_SizeY]
 - 
 
100 
	mov	eax,[WorkScreen_SizeY]
 - 
 
101 
	shr	eax,16
 - 
 
102 
	sub	edx,eax
 91 
	mov	edx,[Window_SizeY]
103 
	sub	edx,20+15+1+49+2+25+10
 92 
	sub	edx,ci_edit_wnd_y_pos+2*ci_edit_wnd_border+34
104 
	shl	ecx,16
 93 
	shl	ecx,16
Line 105... Line 94...
105 
	mov	cx,dx
 94 
	mov	cx,dx ;¢ëá®â  ¡®à¤îà 
106 
 
 95 
 
107 
	mcall SF_DRAW_RECT,,,0xc7cbcf
 96 
	mcall SF_DRAW_RECT,,,0xc7cbcf ;¡®à¤îà á¯à ¢  ®â ®ª­  ¯¥à¥¤ áªà®««¨­£®¬
108 
;------------------------------------------------
 97 
;------------------------------------------------
109 
	mcall	,<5,3>
 98 
	mcall , ;¡®à¤îà á«¥¢  ®â ®ª­ 
110 
;------------------------------------------------
 99 
;------------------------------------------------
111 
	mov	ebx,5
 - 
 
112 
	mov	edx,[Window_SizeX]
 - 
 
113 
	mov	eax,[WorkScreen_SizeX]
 - 
 
114 
	shr	eax,16
 100 
	mov	ebx,ci_edit_wnd_x_pos
115 
	sub	edx,eax
 101 
	mov	edx,[Window_SizeX]
116 
	sub	edx,25+10
 102 
	sub	edx,25+10+ci_edit_wnd_x_pos
Line 117... Line 103...
117 
	shl	ebx,16
 103 
	shl	ebx,16
118 
	mov	bx,dx
 - 
 
119 
 
 104 
	mov	bx,dx ;è¨à¨­  ¡®à¤îà 
120 
	mov	ecx,[WorkScreen_SizeY]
 - 
 
121 
	add	ecx,20+15+1+49+2+3
 - 
 
122 
	mov	edx,[Window_SizeY]
 105 
 
123 
	sub	edx,ecx
 106 
	mov	ecx,[WorkScreen_SizeY]
Line 124... Line 107...
124 
	sub	edx,25+10-3
 107 
	add	ecx,ci_edit_wnd_y_pos+ci_edit_wnd_border
125 
	shl	ecx,16
 108 
	shl	ecx,16
126 
	mov	cx,dx
 109 
	mov	cx,ci_edit_wnd_border ;¢ëá®â  ¡®à¤îà 
127 
 
 110 
 
128 
	mcall SF_DRAW_RECT,,,0xc7cbcf
 - 
 
129 
;------------------------------------------------
 - 
 
130 
	mcall	,,<20+15+1+49+2,3>
 - 
 
131 
;------------------------------------------------
 - 
 
132 
;	draw_volume_rectangle
 - 
 
133 
;	eax - start X
 - 
 
134 
;	ebx - start Y
 111 
	mcall SF_DRAW_RECT,,,0xc7cbcf ;¡®à¤îà ¯®¤ ®ª­®¬ ¨ ­ ¤ áªà®««¨­£®¬
135 
;	ecx - size X
 112 
;------------------------------------------------
136 
;	edx - size Y
 113 
	mcall ,, ;¡®à¤îà ¯®¤ ¯ ­¥«ìî ¨ ­ ¤ ®ª­®¬
137 
 
 114 
;------------------------------------------------
138 
	mov	eax,5
 115 
	mov	eax,ci_edit_wnd_x_pos
139 
	mov	ebx,[Window_SizeY]
 116 
	mov	ebx,[Window_SizeY]
140 
	mov	ecx,[Window_SizeX]
 117 
	mov	ecx,[Window_SizeX]
141 
	mov	edx,20+10
 118 
	mov	edx,20+10
142 
	mov	esi,3
 119 
	mov	esi,3
143 
	sub	ecx,30
 120 
	sub	ecx,35+ci_edit_wnd_x_pos
144 
	sub	ebx,25+10
 121 
	sub	ebx,25+10
145 
	call	draw_volume_rectangle	; horizontal scrollbar
 122 
	call draw_volume_rectangle ; horizontal scrollbar border
146 
;------------------------------------------------
 123 
;------------------------------------------------
147 
	mov	eax,[Window_SizeX]
 124 
	mov	eax,[Window_SizeX]
148 
	mov	ebx,20+15+1+49+2
 125 
	mov	ebx,ci_edit_wnd_y_pos
149 
	mov	ecx,20+10
 126 
	mov	ecx,20+10
150 
	mov	edx,[Window_SizeY]
 127 
	mov	edx,[Window_SizeY]
151 
	mov	esi,3
 128 
	mov	esi,3
152 
	sub	eax,25+10
 129 
	sub	eax,25+10
153 
	sub	edx,20+15+1+49+5+20
 130 
	sub	edx,35+ci_edit_wnd_y_pos
154 
	call	draw_volume_rectangle	; vertical scrollbar
 131 
	call draw_volume_rectangle ; vertical scrollbar border
155 
	call	draw_scrollers
 132 
	call draw_scrollers