From cinelerra-commits-admin@skolelinux.no Sun Feb 3 15:50:25 2008 Return-Path: X-Original-To: cinelerra-commits@e.kevb.net Delivered-To: cinelerra-commits@e.kevb.net Received: from init.linpro.no (init.linpro.no [80.232.38.252]) by e.kevb.net (Postfix) with ESMTP id B38901040007 for ; Sun, 3 Feb 2008 15:50:24 -0500 (EST) Received: from localhost ([127.0.0.1] helo=init.linpro.no) by init.linpro.no with esmtp (Exim 4.50 #1 (Debian)) id 1JLln9-0006vS-EK; Sun, 03 Feb 2008 21:50:19 +0100 Received: from [193.69.32.11] (helo=virusvask01.itsjefen.no) by init.linpro.no with esmtp (Exim 4.50 #1 (Debian)) id 1JLlmi-0006m0-Hn for ; Sun, 03 Feb 2008 21:49:52 +0100 Received: from [193.69.32.11] by 80.232.38.252 (e-nough); Sun, 3 Feb 21:49:43 2008 +0100 Received: from localhost (localhost.localdomain [127.0.0.1]) by virusvask01.itsjefen.no (Postfix) with ESMTP id A0B328AC018 for ; Sun, 3 Feb 2008 21:49:47 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at virusvask01.itsjefen.no Received: from virusvask01.itsjefen.no ([127.0.0.1]) by localhost (virusvask01.itsjefen.no [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id j9z7OcljylWe for ; Sun, 3 Feb 2008 21:49:43 +0100 (CET) Received: from mail-forward.uio.no (mail-forward.uio.no [129.240.10.42]) by virusvask01.itsjefen.no (Postfix) with ESMTP id 80B778AC010 for ; Sun, 3 Feb 2008 21:49:43 +0100 (CET) Received: from mail-mx8.uio.no ([129.240.10.38]) by pat.uio.no with esmtp (Exim 4.67) (envelope-from ) id 1JLlmZ-0000zq-AS for cinelerra-commits@skolelinux.no; Sun, 03 Feb 2008 21:49:43 +0100 Received: from user.skolelinux.no ([158.36.191.139]) by mail-mx8.uio.no with esmtps (TLSv1:AES256-SHA:256) (Exim 4.67) (envelope-from ) id 1JLlmY-0008WA-VF for cinelerra-commits@skolelinux.no; Sun, 03 Feb 2008 21:49:43 +0100 Received: from j6t by user.skolelinux.no with local (Exim 4.63) (envelope-from ) id 1JLlmY-0002sK-Sl for cinelerra-commits@skolelinux.no; Sun, 03 Feb 2008 21:49:42 +0100 To: cinelerra-commits@skolelinux.no Content-Type: text/plain; charset=UTF-8 From: "Johannes Sixt " Message-Id: X-UiO-ClamAV-Virus: No X-UiO-Spam-info: not spam, SpamAssassin (score=0.0, required=5.0, autolearn=disabled, none) X-UiO-Scanned: 2BD12BBE2084CB8997E84B1425C6F17971685288 X-UiO-SPAM-Test: remote_host: 158.36.191.139 spam_score: 0 maxlevel 200 minaction 2 bait 0 mail/h: 2 total 19560 max/h 1171 blacklist 0 greylist 0 ratelimit 0 Content-Transfer-Encoding: quoted-printable X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on spamtrap X-Spam-Status: No, hits=-10.2 required=5.0 tests=DSPAM=-10.19694 version=2.63 X-Spam-Level: X-DSPAM-Signature: !DSPAM:47a628eb62251917880437! X-DSPAM-Probability: -2.0000 X-DSPAM-Confidence: 0.9997 X-Spam-Score: 0.0 (/) Subject: [Cinelerra-commits] r1051 - trunk/hvirtual/cinelerra Sender: cinelerra-commits-admin@skolelinux.no Errors-To: cinelerra-commits-admin@skolelinux.no X-BeenThere: cinelerra-commits@skolelinux.no X-Mailman-Version: 2.0.13 Precedence: bulk List-Unsubscribe: , List-Id: Commits to the Cinelerra CVS. List-Post: List-Help: List-Subscribe: , List-Archive: Date: Sun, 03 Feb 2008 21:49:42 +0100 X-Spam-Score: 0.0 (/) Author: j6t Date: 2008-02-03 21:49:42 +0100 (Sun, 03 Feb 2008) New Revision: 1051 Modified: trunk/hvirtual/cinelerra/awindowgui.C Log: Resources window: Keep the divider inside the window. If the user dragged the divider outside the window, it remained unaccessible. (Fixes bug 465.) Modified: trunk/hvirtual/cinelerra/awindowgui.C =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hvirtual/cinelerra/awindowgui.C 2008-02-02 20:05:57 UTC (rev 10= 50) +++ trunk/hvirtual/cinelerra/awindowgui.C 2008-02-03 20:49:42 UTC (rev 10= 51) @@ -488,19 +488,8 @@ mwindow->theme->get_awindow_sizes(this); mwindow->theme->draw_awindow_bg(this); =20 - asset_list->reposition_window(mwindow->theme->alist_x,=20 - mwindow->theme->alist_y,=20 - mwindow->theme->alist_w,=20 - mwindow->theme->alist_h); - divider->reposition_window(mwindow->theme->adivider_x, - mwindow->theme->adivider_y, - mwindow->theme->adivider_w, - mwindow->theme->adivider_h); - folder_list->reposition_window(mwindow->theme->afolders_x,=20 - mwindow->theme->afolders_y,=20 - mwindow->theme->afolders_w,=20 - mwindow->theme->afolders_h); -=09 + reposition_objects(); + int x =3D mwindow->theme->abuttons_x; int y =3D mwindow->theme->abuttons_y; =20 @@ -537,19 +526,34 @@ =20 void AWindowGUI::reposition_objects() { - mwindow->theme->get_awindow_sizes(this); - asset_list->reposition_window(mwindow->theme->alist_x,=20 - mwindow->theme->alist_y,=20 - mwindow->theme->alist_w,=20 - mwindow->theme->alist_h); - divider->reposition_window(mwindow->theme->adivider_x, + int wmax =3D mwindow->session->awindow_w-mwindow->theme->adivider_w; + int x =3D mwindow->theme->afolders_x; + int w =3D mwindow->theme->afolders_w; + if (w > wmax) + w =3D wmax; + if (w <=3D 0) + w =3D 1; + folder_list->reposition_window(x, mwindow->theme->afolders_y, + w, mwindow->theme->afolders_h); + x =3D mwindow->theme->adivider_x; + if (x > wmax) + x =3D wmax; + if (x < 0) + x =3D 0; + divider->reposition_window(x, mwindow->theme->adivider_y, mwindow->theme->adivider_w, mwindow->theme->adivider_h); - folder_list->reposition_window(mwindow->theme->afolders_x,=20 - mwindow->theme->afolders_y,=20 - mwindow->theme->afolders_w,=20 - mwindow->theme->afolders_h); + int x2 =3D mwindow->theme->alist_x; + if (x2 < x+mwindow->theme->adivider_w) + x2 =3D x+mwindow->theme->adivider_w; + w =3D mwindow->theme->alist_w; + if (w > wmax) + w =3D wmax; + if (w <=3D 0) + w =3D 1; + asset_list->reposition_window(x2, mwindow->theme->alist_y, + w, mwindow->theme->alist_h); flush(); } =20 @@ -1116,6 +1120,7 @@ if(mwindow->session->current_operation =3D=3D DRAG_PARTITION) { mwindow->session->afolders_w =3D gui->get_relative_cursor_x(); + mwindow->theme->get_awindow_sizes(gui); gui->reposition_objects(); } return 0; _______________________________________________ Cinelerra-commits mailing list Cinelerra-commits@skolelinux.no https://init.linpro.no/mailman/skolelinux.no/listinfo/cinelerra-commits