Attachment #2711 for bug #2687

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. View | Details | Raw Unified | Return to bug 2687
Collapse All | Expand All




        delete emb;
        return;
    }

    connect(emb, TQT_SIGNAL(embeddedWindowDestroyed()), TQT_SLOT(updateTrayWindows()));
    emb->setFixedSize(m_iconSize, m_iconSize);

    if (shouldHide(w))
    {

    //
}

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();

Lines 131-137 Link Here

(-)b/kicker/applets/systemtray/systemtrayapplet.h (-1 lines)
131	~TrayEmbed();	131	~TrayEmbed();
132	bool kdeTray() const { return kde_tray; }	132	bool kdeTray() const { return kde_tray; }
133	void setBackground();	133	void setBackground();
134	void getIconSize(int defaultIconSize);
135	private:	134	private:
136	bool kde_tray;	135	bool kde_tray;
137	TQWidget *m_scaledWidget;	136	TQWidget *m_scaledWidget;

Return to bug 2687

Lines 558-566 Link Here

(-)b/kicker/applets/systemtray/systemtrayapplet.cpp (-18 / +2 lines)
558	delete emb;	558	delete emb;
559	return;	559	return;
560	}	560	}
561		561
562	connect(emb, TQT_SIGNAL(embeddedWindowDestroyed()), TQT_SLOT(updateTrayWindows()));	562	connect(emb, TQT_SIGNAL(embeddedWindowDestroyed()), TQT_SLOT(updateTrayWindows()));
563	emb->getIconSize(m_iconSize);	563	emb->setFixedSize(m_iconSize, m_iconSize);
564		564
565	if (shouldHide(w))	565	if (shouldHide(w))
566	{	566	{
Lines 1153-1174 Link Here
1153	//	1153	//
1154	}	1154	}
1155		1155
1156	void TrayEmbed::getIconSize(int defaultIconSize)
1157	{
1158	TQSize minSize = minimumSizeHint();
1159
1160	int width = minSize.width();
1161	int height = minSize.height();
1162
1163	if (width < 1 \|\| width > defaultIconSize)
1164	width = defaultIconSize;
1165	if (height < 1 \|\| height > defaultIconSize)
1166	height = defaultIconSize;
1167
1168	setFixedSize(width, height);
1169	setBackground();
1170	}
1171
1172	void TrayEmbed::setBackground()	1156	void TrayEmbed::setBackground()
1173	{	1157	{
1174	const TQPixmap *pbg = parentWidget()->backgroundPixmap();	1158	const TQPixmap *pbg = parentWidget()->backgroundPixmap();