[Themis-devcvs] SF.net SVN: themis:[671] trunk/themis/modules/CSSViewer/ColumnListView.cpp

[CVS C. to T. <the...@li...>]

Revision: 671
          http://themis.svn.sourceforge.net/themis/?rev=671&view=rev
Author:   z3r0_one
Date:     2011-11-25 19:12:15 +0000 (Fri, 25 Nov 2011)
Log Message:
-----------
Added #ifndef/#else/#endif checks for HAIKU to get the CSS viewer compiling and running on Haiku, and removed the BExperimental namespace from calls to make_color()

Modified Paths:
--------------
    trunk/themis/modules/CSSViewer/ColumnListView.cpp

Modified: trunk/themis/modules/CSSViewer/ColumnListView.cpp
===================================================================
--- trunk/themis/modules/CSSViewer/ColumnListView.cpp	2011-11-12 15:31:17 UTC (rev 670)
+++ trunk/themis/modules/CSSViewer/ColumnListView.cpp	2011-11-25 19:12:15 UTC (rev 671)
@@ -1931,7 +1931,11 @@
 void TitleView::DrawTitle(BView *view, BRect rect, BColumn *column, bool depressed)
 {
 	BRect drawRect;
+#ifndef HAIKU
 	rgb_color borderColor = mix_color(fMasterView->Color(B_COLOR_HEADER_BACKGROUND), BExperimental::make_color(0, 0, 0), 128);
+#else
+	rgb_color borderColor = mix_color(fMasterView->Color(B_COLOR_HEADER_BACKGROUND), make_color(0, 0, 0), 128);
+#endif
 	rgb_color backgroundColor;
 
 	rgb_color bevelHigh;
@@ -1941,15 +1945,26 @@
 	drawRect = rect;
 	drawRect.InsetBy(2, 2);
 	if (depressed) {
+#ifndef HAIKU
 		backgroundColor = mix_color(fMasterView->Color(B_COLOR_HEADER_BACKGROUND), BExperimental::make_color(0, 0, 0), 64);
 		bevelHigh = mix_color(backgroundColor, BExperimental::make_color(0, 0, 0), 64);
 		bevelLow = mix_color(backgroundColor, BExperimental::make_color(255, 255, 255), 128);
+#else
+		backgroundColor = mix_color(fMasterView->Color(B_COLOR_HEADER_BACKGROUND), make_color(0, 0, 0), 64);
+		bevelHigh = mix_color(backgroundColor, make_color(0, 0, 0), 64);
+		bevelLow = mix_color(backgroundColor, make_color(255, 255, 255), 128);
+#endif
 		drawRect.left++;
 		drawRect.top++;
 	} else {
 		backgroundColor = fMasterView->Color(B_COLOR_HEADER_BACKGROUND);
+#ifndef HAIKU
 		bevelHigh = mix_color(backgroundColor, BExperimental::make_color(255, 255, 255), 192);
 		bevelLow = mix_color(backgroundColor, BExperimental::make_color(0, 0, 0), 64);
+#else
+		bevelHigh = mix_color(backgroundColor, make_color(255, 255, 255), 192);
+		bevelLow = mix_color(backgroundColor, make_color(0, 0, 0), 64);
+#endif
 		drawRect.bottom--;
 		drawRect.right--;
 	}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.