Gentoo Archives: gentoo-commits

From: "Jorge Manuel B. S. Vicetto (jmbsvicetto)" <jmbsvicetto@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-sound/amarok/files: amarok-2.5.0-fix-context-view-on-startup.patch
Date: Sun, 08 Jul 2012 15:10:50
Message-Id: 20120708151041.0FF5420065@flycatcher.gentoo.org
1 jmbsvicetto 12/07/08 15:10:40
2
3 Added: amarok-2.5.0-fix-context-view-on-startup.patch
4 Log:
5 [media-sound/amarok-2.5.0-r3] Fix whitespace.
6 [media-sound/amarok-2.5.0-r4] revision bump to add the patch to fix clipped context view - bug 424261.
7 [media-sound/amarok-2.5.90-r1] Move from the overlay the 2.6.0-beta1 - bug 419509.
8
9 (Portage version: 2.2.0_alpha115/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.1 media-sound/amarok/files/amarok-2.5.0-fix-context-view-on-startup.patch
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/amarok/files/amarok-2.5.0-fix-context-view-on-startup.patch?rev=1.1&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/amarok/files/amarok-2.5.0-fix-context-view-on-startup.patch?rev=1.1&content-type=text/plain
16
17 Index: amarok-2.5.0-fix-context-view-on-startup.patch
18 ===================================================================
19 commit a0f4288e0b952830d38151264c0a8b042e32d8a4
20 Author: Matěj Laitl <matej@×××××.cz>
21 Date: Tue Jun 26 00:42:50 2012 +0200
22
23 Fix Context view not being fully formed on startup
24
25 Something from inside Plasma tries to resize context view's sceneRect()
26 to 200x200 px. I don't know why this happens, but let's hope we'll have
27 QML context view soon, so don't investigate and use a work-around.
28
29 BUG: 292895
30 FIXED-IN: 2.6
31 DIGEST: popular bug fixed in Amarok
32
33 diff --git a/src/context/containments/verticallayout/VerticalToolbarContainment.cpp b/src/context/containments/verticallayout/VerticalToolbarContainment.cpp
34 index a23305f..8fa6f9b 100644
35 --- a/src/context/containments/verticallayout/VerticalToolbarContainment.cpp
36 +++ b/src/context/containments/verticallayout/VerticalToolbarContainment.cpp
37 @@ -129,7 +129,8 @@ Context::VerticalToolbarContainment::updateGeometry()
38 if(!view())
39 return;
40
41 - QRectF rect = view()->sceneRect();
42 + // mimic ContextView::resizeEvent(), nothing else seems to work, bug 292895
43 + QRectF rect( view()->pos(), view()->maximumViewportSize() );
44 setGeometry( rect );
45 m_applets->setGeometry( rect );
46 m_applets->refresh();