WebSVN – Kolibri OS – Diff – /programs/media/kiv/trunk/kiv.asm

         jz      key
         dec     eax
         jz      button
+mouse:
+        mov     eax, [need_scrollbar_v]
+        add     eax, [need_scrollbar_h]
+        test    eax, eax
-mouse:
+        jz      .done
         mov     [pict_moved], 0
         invoke  scrollbar_vert_mouse, scroll_bar_data_vertical
         call    slide_show
         jmp     redraw_all
+@@:
+        cmp     eax, 'scl'
+        jnz     .not_scl
+        mov     eax, LIBIMG_SCALE_NONE
+        cmp     [scale_mode], LIBIMG_SCALE_NONE
+        jnz     @f
+        mov     eax, LIBIMG_SCALE_FIT_MIN
+@@:
+        call    set_scale_mode
+        jz      @f
+        call    recalc_work
+@@:
         jmp     redraw_all
-    @@:
+.not_scl:
         or      esi, -1
         cmp     eax, 'bck'
         jz      next_or_prev_handler
         mov     [last_name_component], esi
         ret
 endp
 proc init_frame _img
-        push    ebx edx
+proc init_frame uses ebx edx, _img
         mov     eax, [orig_image]
         cmp     eax, [_img]
         jz      .exit
         mov     [cur_frame_time], eax
-    @@:
+@@:
         mov     [pict.top], 0
         mov     [pict.left], 0
-  .exit:
+.exit:
-        pop     edx ebx
         ret
 endp
         ret
-endp
+endp
 proc draw_view
-        push    ebx esi edi
+proc draw_view uses ebx esi edi
         cmp     [scale_mode], LIBIMG_SCALE_FIT_MIN
         jnz     .scale_none
         push    [view.width]
         push    [view_abs_top]  ; ypos
         push    [view_abs_left] ; xpos
         invoke  img.draw, [cur_frame]
-  .done:
+.done:
-        pop     edi esi ebx
         ret
 endp
+proc draw_scale_button
+        pushad
+        mcall   65, buttons+scalebtn*20, <20,20>, [scale_button_xy], 8, palette
+        mov     ebx, [scale_button_xy]
+        add     ebx, 0x00050006
+        ; print letter(s) corresponding to the current scaling mode
+        mov     edi, 2
+        mov     [scale_button_letter], 'x1'
+        cmp     [scale_mode], LIBIMG_SCALE_NONE
+        jz      @f
+        add     ebx, 0x00020001
+        mov     edi, 1
+        mov     [scale_button_letter], 'W'
+;        cmp     [scale_mode], LIBIMG_SCALE_FIT_MIN
+@@:
+        mcall   4, , 0x800100ff, scale_button_letter
+        popad
+        ret
+endp
-proc draw_toolbar
         push    ebx esi edi
 proc draw_toolbar uses ebx esi edi
         cmp     [toolbar.height], 0
         jz      .quit
         mov     ebx, [toolbar_abs_left]
         mcall
-        add     ebx, ((5 + 25 * 2) SHL 16) + (5 + 25 * 2)
+        add     ebx, ((5+25*2) SHL 16)+(5+25*2)
         mcall
-        add     ebx, ((5 + 25 * 2) SHL 16) + (5 + 25 * 2)
+        add     ebx, ((5+25*2) SHL 16)+(5+25*2)
         mcall
+        add     ebx, ((5+25*1) SHL 16)+(5+25*1)
+        mcall
         mov     ebx, [toolbar_abs_left]
         add     ebx, [toolbar.width]
-        sub     ebx, 25 * 5 + 10
+        sub     ebx, 25*5+10
         shl     ebx, 16
         add     ebx, [toolbar_abs_left]
         mcall    , , , 'fwd'+40000000h
-        add     ebx, (5 + 25 * 1) SHL 16
+        add     ebx, (5+25*1) SHL 16
         mcall    , , , 'bgr'+40000000h
-        add     ebx, (0 + 25 * 1) SHL 16
+        add     ebx, (0+25*1) SHL 16
         mcall    , , , 'sld'+40000000h
+        add     ebx, (5+25*1) SHL 16
+        mcall    , , , 'scl'+40000000h
         mov     ebx, [toolbar_abs_left]
         add     ebx, [toolbar.width]
-        sub     ebx, 25 * 5 + 10
+        sub     ebx, 25*5+10
         add     ebx, 5
         shl     ebx, 16
-        mcall     , buttons + forwardbtn * 20
+        mcall     , buttons+forwardbtn*20
-        add     edx, ((5 + 25 * 1) SHL 16) + 0
+        add     edx, ((5+25*1) SHL 16)+0
-        mcall     , buttons + bgrbtn     * 20
+        mcall     , buttons+bgrbtn    *20
-        add     edx, ((0 + 25 * 1) SHL 16) + 0
+        add     edx, ((0+25*1) SHL 16)+0
-        mcall     , buttons + slidebtn   * 20
+        mcall     , buttons+slidebtn  *20
+        add     edx, ((5+25*1) SHL 16)+0
+;        mcall     , buttons+scalebtn  *20
+        mov     [scale_button_xy], edx
+        call    draw_scale_button
         mov     edx, [client_abs_left]
         add     edx, [client.width]
-        sub     edx, 25 * 5 + 4
+        sub     edx, 25*5+4
         shl     edx, 16
         add     edx, [client_abs_top]
         mcall   , buttons+rotccwbtn*20
-        add     edx, 25 * 65536
+        add     edx, 25*65536
         mcall   , buttons+rot180btn*20
-  .quit:
-        pop     edi esi ebx
+.quit:
         ret
 endp
         pop     esi edx ecx ebx
         ret
 endp
-proc is_root_dir _path
-        push    ecx esi
-        mov     esi, [_path]
-        xor     ecx, ecx
-    @@:
-        lodsb
-        test    al, al
-        jz      .done
-        cmp     al, '/'
-        jnz     @b
-        inc     ecx
-        jmp     @b
-  .done:
-        xor     eax, eax
-        cmp     ecx, 3
-        jz      @f
-        mov     eax, -2
-    @@:
-        pop     esi ecx
-        ret
 endp
 ; fills window_header with window title
 ; window title is generated as '[k/n]  - Kolibri Image Viewer'
 ; n = total files in dir
         mov     eax, [cur_file_idx]
         inc     eax
         call    bin2dec
         mov     byte[edi], '/'
         inc     edi
-        stdcall is_root_dir, path
+        mov     eax, [directory_ptr]
-        add     eax, [files_num]
+        mov     eax, [eax+4]
         call    bin2dec
         mov     word[edi], '] '
         add     edi, 2
         jnz     .recalc_canvas
         test    [bNewImage], 1
         jnz     .recalc_canvas
         stdcall cmp_box, canvas, canvas_prev
         jnz     .recalc_canvas
+        cmp     [bScaleModeChanged], 0
+        jnz     .recalc_canvas
         jmp     .recalc_canvas_done
-  .recalc_canvas:
+.recalc_canvas:
         stdcall recalc_canvas
-  .recalc_canvas_done:
+.recalc_canvas_done:
         ret
 ;-----------------------------------------------------------------------------
 DATA
 s_header        db ' - Kolibri Image Viewer',0
 window_style    dd 0x53FFFFFF
-window          BOX 101, 144, 750, 600  ; left top width height
+window          BOX 101, 144, 529, 324  ; left top width height
 window_prev     BOX 0, 0, 0, 0
 window_save     BOX 0, 0, 0, 0  ; restore after slide show
 client          BOX 0, 0, 0, 0
 client_prev     BOX 0, 0, 0, 0
 virtual at 0
 file 'kivicons.bmp':0xA,4
 load offbits dword from 0
 end virtual
-numimages = 10
+numimages = 11
 openbtn = 0
 backbtn = 1
 forwardbtn = 2
 bgrbtn = 3
 fliphorzbtn = 4
 flipvertbtn = 5
 rotcwbtn = 6
 rotccwbtn = 7
 rot180btn = 8
+slidebtn = 9
-slidebtn = 9
+scalebtn = 10
 palette:
     file 'kivicons.bmp':0x36,offbits-0x36
 buttons:
     file 'kivicons.bmp':offbits
-repeat 10
+repeat 11
-y = % - 1
+y = %-1
-z = 20 - %
+z = 20-%
 repeat numimages*5
     dd  1
     dd  0
     dd  0
 readblocks dd   0
-directory_ptr   dd  0
+directory_ptr   dd 0
-curdir          db 1024 dup (?)
+curdir          rb 1024
 ;------------------------------------------------------------------------------
 I_END:
 align 4
 last_name_component rd 1
 toolbar.height_old  rd 1
+procinfo        process_information
 scale_button_xy dd ?
-procinfo        process_information
+scale_button_letter dd ?        ; i.e. 'x1',0
 align 16
 path            rb 4096
 window_header   rb 256

Subversion Repositories Kolibri OS

(root)/programs/media/kiv/trunk/kiv.asm – Rev 7784 → 7860