Subversion Repositories Kolibri OS

Rev

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

Rev 7660 Rev 7726
Line 152... Line 152...
152 
        jz      button
 152 
        jz      button
Line 153... Line 153...
153 
 
 153 
 
154 
mouse:
 154 
mouse:
Line 155... Line -...
155 
        mov     [pict_moved], 0
 - 
 
156 
 
 155 
        mov     [pict_moved], 0
157
156 
 
158 
        invoke  scrollbar_vert_mouse, scroll_bar_data_vertical
 157 
        invoke  scrollbar_vert_mouse, scroll_bar_data_vertical
159 
        invoke  scrollbar_hort_mouse, scroll_bar_data_horizontal
 158 
        invoke  scrollbar_hort_mouse, scroll_bar_data_horizontal
160 
        xor     ecx, ecx
 159 
        xor     ecx, ecx
Line 325... Line 324...
325 
        jmp     keyloop
 324 
        jmp     keyloop
326 
  .slide:
 325 
  .slide:
327 
        call    slide_show
 326 
        call    slide_show
328 
        jmp     keyloop
 327 
        jmp     keyloop
329 
  .set_scale_none:
 328 
  .set_scale_none:
330 
        stdcall set_scale_mode, LIBIMG_SCALE_NONE
 329 
        mov     eax, LIBIMG_SCALE_NONE
331 
        mov     eax, [scale_mode]
 330 
        call    set_scale_mode
- 
 
 331 
        jz      @f
332 
        call    recalc_canvas
 332 
        call    recalc_canvas
333 
;        call    draw_view
 333 
    @@:
334 
        jmp     keyloop
 334 
        jmp     keyloop
335 
  .set_scale_fit_min:
 335 
  .set_scale_fit_min:
336 
        stdcall set_scale_mode, LIBIMG_SCALE_FIT_MIN
 336 
        mov     eax, LIBIMG_SCALE_FIT_MIN
337 
        mov     eax, [scale_mode]
 337 
        call    set_scale_mode
- 
 
 338 
        jz      @f
338 
        call    recalc_work
 339 
        call    recalc_work
339 
;        call    draw_view
 340 
    @@:
340 
        jmp     keyloop
 341 
        jmp     keyloop
341 
  .move_pictport_left:
 342 
  .move_pictport_left:
342 
        stdcall move_pictport, -KEY_MOVE_PIXELS, 0
 343 
        stdcall move_pictport, -KEY_MOVE_PIXELS, 0
343 
        stdcall update_scrollbars, eax
 344 
        stdcall update_scrollbars, eax
344 
        call    draw_view
 345 
        call    draw_view
Line 667... Line 668...
667 
        stdcall copy_box, window, window_save
 668 
        stdcall copy_box, window, window_save
668 
        movzx   eax, [bShowToolbar]
 669 
        movzx   eax, [bShowToolbar]
669 
        mov     [bShowToolbarSave], al
 670 
        mov     [bShowToolbarSave], al
670 
        mov     [bShowToolbar], 0
 671 
        mov     [bShowToolbar], 0
671 
        mov     [canvas_padding], 0
 672 
        mov     [canvas_padding], 0
672 
;        mov     eax, [procinfo.box.width]
 - 
 
673 
;        mov     [window.width], eax
 - 
 
674 
;        mov     eax, [procinfo.box.height]
 - 
 
675 
;        mov     [window.height], eax
 - 
 
676 
;        mov     eax, [procinfo.box.left]
 - 
 
677 
;        mov     [window.left], eax
 - 
 
678 
;        mov     eax, [procinfo.box.top]
 - 
 
679 
;        mov     [window.top], eax
 - 
 
680 
        mov     [bg_color], 0x00000000
 673 
        mov     [bg_color], 0x00000000
681 
        mcall   SF_GET_SCREEN_SIZE
 674 
        mcall   SF_GET_SCREEN_SIZE
682 
        mov     edx, eax
 675 
        mov     edx, eax
683 
        shr     edx, 16
 676 
        shr     edx, 16
684 
        movzx   eax, ax
 677 
        movzx   eax, ax
685 
        mov     esi, eax
 678 
        mov     esi, eax
686 
        mcall   SF_CHANGE_WINDOW, 0, 0, ,
 679 
        mcall   SF_CHANGE_WINDOW, 0, 0, ,
687 
        stdcall set_scale_mode, LIBIMG_SCALE_FIT_MIN
 680 
        mov     eax, LIBIMG_SCALE_FIT_MIN
- 
 
 681 
        call    set_scale_mode
Line 688... Line 682...
688 
 
 682 
 
689 
  .done:
 683 
  .done:
690 
        pop     edi esi ebx
 684 
        pop     edi esi ebx
691 
        ret
 685 
        ret
Line 1775... Line 1769...
1775 
        pop     ebx
 1769 
        pop     ebx
1776 
        ret
 1770 
        ret
1777 
endp
 1771 
endp
Line 1778... Line 1772...
1778 
 
 1772 
 
1779 
 
 1773 
 
1780 
proc set_scale_mode _mode
 - 
 
1781 
        push    eax ecx
 1774 
; eax: new scaling mode
1782 
        xor     ecx, ecx
 - 
 
1783 
        mov     eax, [_mode]
 1775 
; z/Z - not/changed
1784 
 
 - 
 
1785 
        cmp     [scale_mode], eax
 - 
 
1786 
        jz      @f
 1776 
proc set_scale_mode
1787 
        mov     [bScaleModeChanged], 1
 - 
 
1788 
        mov     [scale_mode], eax
 1777 
        cmp     eax, [scale_mode]
1789 
    @@:
 1778 
        mov     [scale_mode], eax
1790 
        pop     ecx eax
 1779 
        setnz   [bScaleModeChanged]
Line 1791... Line 1780...
1791 
        ret
 1780 
        ret
1792 
endp
 1781 
endp