From b5e8d43d625ac266c51f41be48d640ed310d7138 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Tue, 22 Apr 2014 18:07:27 +0000 Subject: [PATCH] zSea: fix window position in case when @panel in the top (consider working area) git-svn-id: svn://kolibrios.org@4878 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/media/zsea/data.inc | 2 +- programs/media/zsea/zSea.asm | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/programs/media/zsea/data.inc b/programs/media/zsea/data.inc index 1117be33e0..2ac8796044 100644 --- a/programs/media/zsea/data.inc +++ b/programs/media/zsea/data.inc @@ -38,7 +38,7 @@ lsz fitext,\ db 0 ;--------------------------------------------------------------------- Authors_text: -.1: db 'zSea version: 1.00 RC5 Date: 26/03/2013',0 +.1: db 'zSea version: 1.00 RC5 Date: 22/04/2014',0 .2: db 'Authors:',0 .3: db 'Marat Zakiyanov aka Mario(Mario79)',0 .4: db 'zSea program, modules: cnv_bmp.obj,',0 diff --git a/programs/media/zsea/zSea.asm b/programs/media/zsea/zSea.asm index cef902b797..90da5fcfd5 100644 --- a/programs/media/zsea/zSea.asm +++ b/programs/media/zsea/zSea.asm @@ -1,6 +1,7 @@ ;***************************************************************************** +;***************************************************************************** ; zSea - advanced image viewer for KolibriOS -; Copyright (c) 2008-2013, Marat Zakiyanov aka Mario79, aka Mario +; Copyright (c) 2008-2014, Marat Zakiyanov aka Mario79, aka Mario ; All rights reserved. ; ; Redistribution and use in source and binary forms, with or without @@ -25,7 +26,7 @@ ; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ;***************************************************************************** -; v.1.0 rñ5 26.03.2013 +; v.1.0 rñ5 22.04.2014 ;****************************************************************************** use32 org 0x0 @@ -211,9 +212,14 @@ START: ; start of execution jae @f mov [wnd_width],635 @@: - cmp [wnd_height],150 + mcall 48, 5 ; GetClientTop, fix for case when @patel in the top + shr ebx, 16 + mov ecx,ebx + shl ecx,16 + add ecx,150 ; [y start] *65536 + [y size] + cmp [wnd_height],ecx jae @f - mov [wnd_height],150 + mov [wnd_height],ecx @@: ; call draw_window red: