Author: mlytwyn
Date: Mon Aug  3 19:56:29 2015
New Revision: 38851

URL: http://svn.gna.org/viewcvs/gnustep?rev=38851&view=rev
Log:
Fix background coloring

Modified:
    libs/gui/branches/gnustep_testplant_branch/Source/NSBox.m

Modified: libs/gui/branches/gnustep_testplant_branch/Source/NSBox.m
URL: 
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Source/NSBox.m?rev=38851&r1=38850&r2=38851&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Source/NSBox.m   (original)
+++ libs/gui/branches/gnustep_testplant_branch/Source/NSBox.m   Mon Aug  3 
19:56:29 2015
@@ -462,19 +462,22 @@
 
 - (BOOL) isOpaque
 {
+#if 0 //TESTPLANT-MAL-MERGE-06202015 - this breaks some drawing...
   // FIXME: Depends on theme; if always returning NO is a performance hit
   // we can check if GSTheme is going to draw an old-style opaque box
   // or not.
   return NO;
-  // if (_box_type == NSBoxCustom)
-  //   {
-  //     return !_transparent;
-  //   }
-  // else
-  //   {
-  //     return YES;
-  //   }
-    }
+#else
+   if (_box_type == NSBoxCustom)
+     {
+       return !_transparent;
+     }
+   else
+     {
+       return YES;
+     }
+#endif
+}
 
 - (NSColor*) fillColor
 {


_______________________________________________
Gnustep-cvs mailing list
Gnustep-cvs@gna.org
https://mail.gna.org/listinfo/gnustep-cvs

Reply via email to