[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [Amarok] 0828718: lyrics applet: disable collpasing for now
From:       "Rick W. Chen" <stuffcorpse () archlinux ! us>
Date:       2010-03-01 1:30:04
Message-ID: 201003010130.o211U4PS012327 () kore ! kollide ! net
[Download RAW message or body]

commit 082871876cc10d938ca325daf31c338ad706d059
Author: Rick W. Chen <stuffcorpse@archlinux.us>
Date:   Mon Mar 1 07:00:10 2010 +1300

    lyrics applet: disable collpasing for now
    
    Previously [0fb44c2], the lyrics applet is stopped from collpasing to a
    suitable size when data is updated (because of weird behaviour with kde
    4.4/qt 4.6). But when editing or changing the lyrics font, the applet is
    still collapsed, causing new lyrics on track change to still use the old
    size. This disables all the collapsing for now.
    
    BUG: 228922

diff --git a/ChangeLog b/ChangeLog
index 20bc152..f439ad8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,7 @@ VERSION 2.3
       last check.
 
   BUGFIXES:
+    * Fixed lyrics window size too small after edit. (BR 228922)
     * Fixed odd behaviour when doing drag-and-drop from Collection browser.
       (BR 222500)
     * Show artist and title instead of raw track ID when copying/deleting
diff --git a/src/context/applets/lyrics/LyricsApplet.cpp b/src/context/applets/lyrics/LyricsApplet.cpp
index 55d41af..49574a7 100644
--- a/src/context/applets/lyrics/LyricsApplet.cpp
+++ b/src/context/applets/lyrics/LyricsApplet.cpp
@@ -408,7 +408,7 @@ LyricsApplet::changeLyricsFont()
 
     debug() << "Setting Lyrics Applet font: " << font.family() << " " << font.pointSize();
     // resize with new font
-    collapseToMin();
+    // collapseToMin();
 }
 
 void
@@ -520,7 +520,7 @@ LyricsApplet::setEditing( const bool isEditing )
 {
     m_lyrics->setReadOnly( !isEditing );
     update();
-    collapseToMin();
+    // collapseToMin();
 }
 
 
[prev in list] [next in list] [prev in thread] [next in thread]