Subversion Repositories Kolibri OS

Rev

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

Rev 114 Rev 115
Line 201... Line 201...
201
        jnz     @f
201
        jnz     @f
202
        mov     ebp,skin_inactive
202
        mov     ebp,skin_inactive
203
    @@:
203
    @@:
Line 204... Line 204...
204
 
204
 
205
        mov     esi,[esp+4]
205
        mov     esi,[esp+4]
206
        mov     eax,[esi+8]    ; window width
206
        mov     eax,[esi+WDATA.box.width]    ; window width
207
        mov     edx,[ebp+SKIN_DATA.left.left]
207
        mov     edx,[ebp+SKIN_DATA.left.left]
208
        shl     edx,16
208
        shl     edx,16
209
        mov     ecx,[ebp+SKIN_DATA.left.width]
209
        mov     ecx,[ebp+SKIN_DATA.left.width]
210
        shl     ecx,16
210
        shl     ecx,16
Line 211... Line 211...
211
        add     ecx,[_skinh]
211
        add     ecx,[_skinh]
212
 
212
 
Line 213... Line 213...
213
        mov     ebx, [ebp+SKIN_DATA.left.data]
213
        mov     ebx, [ebp+SKIN_DATA.left.data]
214
        call    sys_putimage_with_check
214
        call    sys_putimage_with_check
215
 
215
 
216
        mov     esi,[esp+4]
216
        mov     esi,[esp+4]
217
        mov     eax,[esi+8]
217
        mov     eax,[esi+WDATA.box.width]
218
        sub     eax,[ebp+SKIN_DATA.left.width]
218
        sub     eax,[ebp+SKIN_DATA.left.width]
219
        sub     eax,[ebp+SKIN_DATA.oper.width]
219
        sub     eax,[ebp+SKIN_DATA.oper.width]
Line 245... Line 245...
245
        dec     eax
245
        dec     eax
246
        jnz     .baseskinloop
246
        jnz     .baseskinloop
247
  .non_base:
247
  .non_base:
Line 248... Line 248...
248
 
248
 
249
        mov     esi,[esp+4]
249
        mov     esi,[esp+4]
250
        mov     edx,[esi+8]
250
        mov     edx,[esi+WDATA.box.width]
251
        sub     edx,[ebp+SKIN_DATA.oper.width]
251
        sub     edx,[ebp+SKIN_DATA.oper.width]
252
        inc     edx
252
        inc     edx
253
        shl     edx,16
253
        shl     edx,16
Line 276... Line 276...
276
        cmp     byte [esp+32+4+4],0
276
        cmp     byte [esp+32+4+4],0
277
        jne     @f
277
        jne     @f
278
        mov     ebp,skin_inactive
278
        mov     ebp,skin_inactive
279
     @@:
279
     @@:
Line 280... Line 280...
280
 
280
 
281
        mov   eax,[edi+0]
281
        mov   eax,[edi+WDATA.box.left]
282
        shl   eax,16
282
        shl   eax,16
283
        mov   ax,[edi+0]
283
		mov   ax,word [edi+WDATA.box.left]
284
        add   ax,[edi+8]
284
		add   ax,word [edi+WDATA.box.width]
285
        mov   ebx,[edi+4]
285
        mov   ebx,[edi+WDATA.box.top]
286
        shl   ebx,16
286
        shl   ebx,16
287
        mov   bx,[edi+4]
287
		mov   bx,word [edi+WDATA.box.top]
288
        add   bx,[edi+12]
288
		add   bx,word [edi+WDATA.box.height]
289
;        mov   esi,[edi+24]
289
;        mov   esi,[edi+24]
290
;        shr   esi,1
290
;        shr   esi,1
291
;        and   esi,0x007f7f7f
291
;        and   esi,0x007f7f7f
292
        mov   esi,[ebp+SKIN_DATA.colors.outer]
292
        mov   esi,[ebp+SKIN_DATA.colors.outer]
Line 315... Line 315...
315
        cmp   dword[skin_data],'SKIN'
315
        cmp   dword[skin_data],'SKIN'
316
        je    @f
316
        je    @f
317
        xor   eax,eax
317
        xor   eax,eax
318
        xor   ebx,ebx
318
        xor   ebx,ebx
319
        mov   esi,[esp]
319
        mov   esi,[esp]
320
        mov   ecx,[esi+8]
320
        mov   ecx,[esi+WDATA.box.width]
321
        inc   ecx
321
        inc   ecx
322
        mov   edx,[_skinh]
322
        mov   edx,[_skinh]
323
        mov   edi,[common_colours+4] ; standard grab color
323
        mov   edi,[common_colours+4] ; standard grab color
324
        call  [drawbar]
324
        call  [drawbar]
325
        jmp   draw_clientbar
325
        jmp   draw_clientbar
Line 330... Line 330...
330
 
330
 
Line 331... Line 331...
331
    draw_clientbar:
331
    draw_clientbar:
Line 332... Line 332...
332
 
332
 
333
        mov   esi,[esp]
333
        mov   esi,[esp]
334
 
334
 
335
        mov   edx,[esi+04]                       ; WORK AREA
335
        mov   edx,[esi+WDATA.box.top]                       ; WORK AREA
336
        add   edx,21+5
336
        add   edx,21+5
337
        mov   ebx,[esi+04]
337
        mov   ebx,[esi+WDATA.box.top]
338
        add   ebx,[esi+12]
338
        add   ebx,[esi+WDATA.box.height]
339
        cmp   edx,ebx
339
        cmp   edx,ebx
340
        jg    _noinside2
340
        jg    _noinside2
341
        mov   eax,5
341
        mov   eax,5
342
        mov   ebx,[_skinh]
342
        mov   ebx,[_skinh]
343
        mov   ecx,[esi+8]
343
        mov   ecx,[esi+WDATA.box.width]
344
        mov   edx,[esi+12]
344
        mov   edx,[esi+WDATA.box.height]
345
        sub   ecx,4
345
        sub   ecx,4
346
        sub   edx,4
346
        sub   edx,4
Line 347... Line 347...
347
        mov   edi,[esi+16]
347
        mov   edi,[esi+WDATA.cl_workarea]
348
        call  [drawbar]
348
        call  [drawbar]
Line 371... Line 371...
371
        add   eax,2         ; x start
371
        add   eax,2         ; x start
372
        xor   ebx,ebx
372
        xor   ebx,ebx
373
        cmp   [skin_btn_close.left],0
373
        cmp   [skin_btn_close.left],0
374
        jge   _bCx_at_right
374
        jge   _bCx_at_right
375
        mov   ebx,[esp]
375
        mov   ebx,[esp]
376
        mov   ebx,[ebx+8]
376
        mov   ebx,[ebx+WDATA.box.width]
377
        inc   ebx
377
        inc   ebx
378
      _bCx_at_right:
378
      _bCx_at_right:
379
        add   ebx,[skin_btn_close.left]
379
        add   ebx,[skin_btn_close.left]
380
        mov   [eax],bx
380
        mov   [eax],bx
381
        add   eax,2         ; x size
381
        add   eax,2         ; x size
Line 410... Line 410...
410
        add   eax,2         ; x start
410
        add   eax,2         ; x start
411
        xor   ebx,ebx
411
        xor   ebx,ebx
412
        cmp   [skin_btn_minimize.left],0
412
        cmp   [skin_btn_minimize.left],0
413
        jge   _bMx_at_right
413
        jge   _bMx_at_right
414
        mov   ebx,[esp]
414
        mov   ebx,[esp]
415
        mov   ebx,[ebx+8]
415
        mov   ebx,[ebx+WDATA.box.width]
416
        inc   ebx
416
        inc   ebx
417
      _bMx_at_right:
417
      _bMx_at_right:
418
        add   ebx,[skin_btn_minimize.left]
418
        add   ebx,[skin_btn_minimize.left]
419
        mov   [eax],bx
419
        mov   [eax],bx
420
        add   eax,2         ; x size
420
        add   eax,2         ; x size