[X2Go-Commits] [x2goclient] 01/01: src/SVGFrame.cpp: simplify implementation a lot.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 76619ddc13ae4d5595a4d32115fabb0a47cc05c5
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Dec 30 18:10:18 2019 +0100

    src/SVGFrame.cpp: simplify implementation a lot.
    
    Only paint data onto the widget in the paintEvent () function.
    
    Drop setting a palette based upon the rendered SVG image, which has been
    very wrong to do from the beginning and only lead to visual glitches.
    
    Correctly repaint single-frame SVG files.
---
 src/SVGFrame.cpp | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

diff --git a/src/SVGFrame.cpp b/src/SVGFrame.cpp
index 579d29a..3f2938c 100644
--- a/src/SVGFrame.cpp
+++ b/src/SVGFrame.cpp
@@ -44,13 +44,6 @@ SVGFrame::SVGFrame ( QString fname,bool st,QWidget* parent,
 		if ( drawImg )
 		{
 			setAutoFillBackground ( true );
-			QPalette pal=palette();
-			QImage img ( renderer->defaultSize(),
-			             QImage::Format_ARGB32_Premultiplied );
-			QPainter p ( &img );
-			renderer->render ( &p );
-			pal.setBrush ( QPalette::Window,QBrush ( QPixmap::fromImage ( img ) ) );
-			setPalette ( pal );
 		}
 		else
 		{
@@ -74,11 +67,9 @@ SVGFrame::SVGFrame ( QWidget* parent,
 
 void SVGFrame::paintEvent ( QPaintEvent* event )
 {
-	if ( repaint && !drawImg && !empty )
+	if ( repaint && !empty )
 	{
 		QPainter p ( this );
-		p.setViewport ( 0, 0, width(), height() );
-		p.eraseRect ( 0, 0, width(), height() );
 		renderer->render ( &p );
 	}
 	QFrame::paintEvent ( event );
@@ -89,16 +80,6 @@ void SVGFrame::resizeEvent ( QResizeEvent* event )
 {
 	QFrame::resizeEvent ( event );
 	emit resized ( event->size() );
-	if ( drawImg && event->size().width() >0 && event->size().height() >0 &&!empty )
-	{
-		QPalette pal=palette();
-		QImage img ( event->size(),QImage::Format_ARGB32_Premultiplied );
-		QPainter p ( &img );
-		if ( p.isActive() )
-			renderer->render ( &p );
-		pal.setBrush ( QPalette::Window,QBrush ( QPixmap::fromImage ( img ) ) );
-		setPalette ( pal );
-	}
 }
 
 

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git