Attachment 2711 Details for Bug 2687 – patch (1)

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] patch (1)

tdebase-fix-tray-embed-icon-size.diff (text/plain), 1.46 KB, created by Slávek Banko on 2016-09-28 08:49:59 CDT

(hide)

Description:

Filename:

MIME Type:

Creator: Slávek Banko

Created: 2016-09-28 08:49:59 CDT

Size: 1.46 KB

patch

obsolete

>Index: b/kicker/applets/systemtray/systemtrayapplet.cpp
>===================================================================
>--- a/kicker/applets/systemtray/systemtrayapplet.cpp
>+++ b/kicker/applets/systemtray/systemtrayapplet.cpp
>@@ -558,9 +558,9 @@
>         delete emb;
>         return;
>     }
>-    
>+
>     connect(emb, TQT_SIGNAL(embeddedWindowDestroyed()), TQT_SLOT(updateTrayWindows()));
>-    emb->getIconSize(m_iconSize);
>+    emb->setFixedSize(m_iconSize, m_iconSize);
> 
>     if (shouldHide(w))
>     {
>@@ -1153,22 +1153,6 @@
>     //
> }
> 
>-void TrayEmbed::getIconSize(int defaultIconSize)
>-{
>-    TQSize minSize = minimumSizeHint();
>-    
>-    int width = minSize.width();
>-    int height = minSize.height();
>-    
>-    if (width < 1 || width > defaultIconSize)
>-        width = defaultIconSize;
>-    if (height < 1 || height > defaultIconSize)
>-        height = defaultIconSize;
>-    
>-    setFixedSize(width, height);
>-    setBackground();
>-}
>-
> void TrayEmbed::setBackground()
> {
>     const TQPixmap *pbg = parentWidget()->backgroundPixmap();
>Index: b/kicker/applets/systemtray/systemtrayapplet.h
>===================================================================
>--- a/kicker/applets/systemtray/systemtrayapplet.h
>+++ b/kicker/applets/systemtray/systemtrayapplet.h
>@@ -131,7 +131,6 @@
>     ~TrayEmbed();
>     bool kdeTray() const { return kde_tray; }
>     void setBackground();
>-    void getIconSize(int defaultIconSize);
> private:
>     bool kde_tray;
>     TQWidget *m_scaledWidget;

Actions: View | Diff

Attachments on bug 2687: 2686 | 2710 | 2711 | 2740