Attachment #2240 for bug #1499

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 1499
Collapse All | Expand All

Lines 142-147 Link Here

(-)kdesktop/bgmanager.h.orig (+1 lines)
142	int fadeDesk;	142	int fadeDesk;
143	TQTime mBenchmark;	143	TQTime mBenchmark;
144	bool crossInit;	144	bool crossInit;
		145	bool resizingDesktop; // is True if desktop is resizing
145	};	146	};
146		147
147	#endif // __BGMANAGER_H__	148	#endif // __BGMANAGER_H__




    /*CrossFade's config*/
    m_crossTimer = new TQTimer(this);
    connect(m_crossTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotCrossFadeTimeout()));
    resizingDesktop = true;
    /*Ends here*/



 */
void KBackgroundManager::slotChangeDesktop(int desk)
{
    resizingDesktop = true;
    TQSize s(m_pKwinmodule->numberOfViewports(m_pKwinmodule->currentDesktop()));
    m_numberOfViewports = s.width() * s.height();
    if (m_numberOfViewports < 1) {

    if (current)
    {
        //START
        if (m_Renderer[effectiveDesktop()]->renderer(0)->crossFadeBg() && !m_Renderer[effectiveDesktop()]->renderer(0)->usingCrossXml() && !resizingDesktop){	
            int mode = m_Renderer[effectiveDesktop()]->renderer(0)->wallpaperMode();
            width = TQApplication::desktop()->screenGeometry().width();
            height = TQApplication::desktop()->screenGeometry().height();

        r->saveCacheFile();
        r->cleanup();
    }
    
    resizingDesktop = false;
}




void KBackgroundManager::desktopResized()
{
    resizingDesktop = true;
    for (unsigned i=0; i<m_Renderer.size(); i++)
    {
        KVirtualBGRenderer * r = m_Renderer[i];

#endif
    
    m_Hash = 0;
    if( m_pDesktop ) {
        m_pDesktop->resize( kapp->desktop()->geometry().size());
        if (m_Renderer[effectiveDesktop()]->renderer(0)->usingCrossXml()){
            m_Renderer[effectiveDesktop()]->renderer(0)->changeWallpaper();
        }
    }
    // Repaint desktop
    slotChangeDesktop(0);
    repaintBackground();

Return to bug 1499

Lines 118-123 Link Here

(-)kdesktop/bgmanager.cc.orig (-2 / +11 lines)
118	/CrossFade's config/	118	/CrossFade's config/
119	m_crossTimer = new TQTimer(this);	119	m_crossTimer = new TQTimer(this);
120	connect(m_crossTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotCrossFadeTimeout()));	120	connect(m_crossTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotCrossFadeTimeout()));
		121	resizingDesktop = true;
121	/Ends here/	122	/Ends here/
122		123
123		124
Lines 351-356 Link Here
351	*/	352	*/
352	void KBackgroundManager::slotChangeDesktop(int desk)	353	void KBackgroundManager::slotChangeDesktop(int desk)
353	{	354	{
		355	resizingDesktop = true;
354	TQSize s(m_pKwinmodule->numberOfViewports(m_pKwinmodule->currentDesktop()));	356	TQSize s(m_pKwinmodule->numberOfViewports(m_pKwinmodule->currentDesktop()));
355	m_numberOfViewports = s.width() * s.height();	357	m_numberOfViewports = s.width() * s.height();
356	if (m_numberOfViewports < 1) {	358	if (m_numberOfViewports < 1) {
Lines 646-652 Link Here
646	if (current)	648	if (current)
647	{	649	{
648	//START	650	//START
649	if (m_Renderer[effectiveDesktop()]->renderer(0)->crossFadeBg() && !m_Renderer[effectiveDesktop()]->renderer(0)->usingCrossXml()){	651	if (m_Renderer[effectiveDesktop()]->renderer(0)->crossFadeBg() && !m_Renderer[effectiveDesktop()]->renderer(0)->usingCrossXml() && !resizingDesktop){
650	int mode = m_Renderer[effectiveDesktop()]->renderer(0)->wallpaperMode();	652	int mode = m_Renderer[effectiveDesktop()]->renderer(0)->wallpaperMode();
651	width = TQApplication::desktop()->screenGeometry().width();	653	width = TQApplication::desktop()->screenGeometry().width();
652	height = TQApplication::desktop()->screenGeometry().height();	654	height = TQApplication::desktop()->screenGeometry().height();
Lines 700-705 Link Here
700	r->saveCacheFile();	702	r->saveCacheFile();
701	r->cleanup();	703	r->cleanup();
702	}	704	}
		705
		706	resizingDesktop = false;
703	}	707	}
704		708
705		709
Lines 1004-1009 Link Here
1004		1008
1005	void KBackgroundManager::desktopResized()	1009	void KBackgroundManager::desktopResized()
1006	{	1010	{
		1011	resizingDesktop = true;
1007	for (unsigned i=0; i<m_Renderer.size(); i++)	1012	for (unsigned i=0; i<m_Renderer.size(); i++)
1008	{	1013	{
1009	KVirtualBGRenderer * r = m_Renderer[i];	1014	KVirtualBGRenderer * r = m_Renderer[i];
Lines 1025-1032 Link Here
1025	#endif	1030	#endif
1026		1031
1027	m_Hash = 0;	1032	m_Hash = 0;
1028	if( m_pDesktop )	1033	if( m_pDesktop ) {
1029	m_pDesktop->resize( kapp->desktop()->geometry().size());	1034	m_pDesktop->resize( kapp->desktop()->geometry().size());
		1035	if (m_Renderer[effectiveDesktop()]->renderer(0)->usingCrossXml()){
		1036	m_Renderer[effectiveDesktop()]->renderer(0)->changeWallpaper();
		1037	}
		1038	}
1030	// Repaint desktop	1039	// Repaint desktop
1031	slotChangeDesktop(0);	1040	slotChangeDesktop(0);
1032	repaintBackground();	1041	repaintBackground();