Bugfix for #387 - revert to using heuristic mask on mac since automasking leaves 'holes' in the splash image.

timlinux · timlinux · commit 54ddd76a735d · 2006-11-27T02:05:59.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@6128 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/gui/main.cpp b/src/gui/main.cpp
@@ -458,7 +458,16 @@ int main(int argc, char *argv[])
   }
   else
   {
+#ifdef Q_OS_MACX
+    //on mac automasking as done below does not work (as of qt 4.2.1)
+    //so we do it the old way see bug #387
+    qDebug("setting mask for mac");
+    QPixmap myMaskPixmap(mySplashPath+QString("splash_mask.png"), 0, Qt::ThresholdDither | Qt::ThresholdAlphaDither | Qt::AvoidDither ); 
+    mypSplash->setMask( myMaskPixmap.createHeuristicMask() ); 
+#else
+    //for win and linux we can just automask and png transparency areas will be used
     mypSplash->setMask( myPixmap.mask() );
+#endif
     mypSplash->show();
   }
 

Original file line number	Diff line number	Diff line change
`@@ -458,7 +458,16 @@ int main(int argc, char *argv[])`
`458`	`458`	`}`
`459`	`459`	`else`
`460`	`460`	`{`
	`461`	`+#ifdef Q_OS_MACX`
	`462`	`+ //on mac automasking as done below does not work (as of qt 4.2.1)`
	`463`	`+ //so we do it the old way see bug #387`
	`464`	`+ qDebug("setting mask for mac");`
	`465`	`+ QPixmap myMaskPixmap(mySplashPath+QString("splash_mask.png"), 0, Qt::ThresholdDither \| Qt::ThresholdAlphaDither \| Qt::AvoidDither );`
	`466`	`+ mypSplash->setMask( myMaskPixmap.createHeuristicMask() );`
	`467`	`+#else`
	`468`	`+ //for win and linux we can just automask and png transparency areas will be used`
`461`	`469`	`mypSplash->setMask( myPixmap.mask() );`
	`470`	`+#endif`
`462`	`471`	`mypSplash->show();`
`463`	`472`	`}`
`464`	`473`