From be493b8d7e5dc44cc16f17b38e38a2368453d370 Mon Sep 17 00:00:00 2001
From: zeljko <zeljko@lazarus-ide.org>
Date: Fri, 10 Feb 2012 08:13:15 +0000
Subject: [PATCH] Gtk2: fixed painting of mono bitmaps, gtk2 assumes that bmp +
 mask = rgba. issue #12362

git-svn-id: trunk@35281 -
---
 lcl/interfaces/gtk2/gtk2lclintf.inc | 38 +++++++++++++++++------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/lcl/interfaces/gtk2/gtk2lclintf.inc b/lcl/interfaces/gtk2/gtk2lclintf.inc
index 05dab26ce2..aec79c4d65 100644
--- a/lcl/interfaces/gtk2/gtk2lclintf.inc
+++ b/lcl/interfaces/gtk2/gtk2lclintf.inc
@@ -562,14 +562,14 @@ function TGtk2WidgetSet.RawImage_QueryDescription(AFlags: TRawImageQueryFlags; v
 var
   Desc: TRawImageDescription;
 begin
-  if riqfGrey in AFlags
-  then begin
+  if riqfGrey in AFlags then
+  begin
     DebugLn('TGtk2WidgetSet.RawImage_QueryDescription: riqfGrey not (yet) supported');
     Exit(False);
   end;
   
-  if riqfPalette in AFlags
-  then begin
+  if riqfPalette in AFlags then
+  begin
     DebugLn('TGtk2WidgetSet.RawImage_QueryDescription: riqfPalette not (yet) supported');
     Exit(False);
   end;
@@ -578,11 +578,16 @@ begin
   Result := RawImage_DescriptionFromDrawable(Desc, nil, riqfAlpha in AFlags);
   if not Result then Exit;
 
-  if not (riqfUpdate in AFlags)
-  then ADesc.Init;
+  if not (riqfUpdate in AFlags) then
+    ADesc.Init;
 
-  if riqfMono in AFlags
-  then begin
+  // if there's mask gtk2 assumes it's rgba. issue #12362
+  if (riqfMono in AFlags) and (riqfMask in AFlags) and
+    (Desc.BitsPerPixel = 32) then
+      AFlags := AFlags - [riqfMono] + [riqfRgb];
+
+  if riqfMono in AFlags then
+  begin
     ADesc.Format := ricfGray;
     ADesc.Depth := 1;
     ADesc.BitOrder := Desc.MaskBitOrder;
@@ -598,7 +603,7 @@ begin
     ADesc.BluePrec := 1;
     ADesc.BlueShift := Desc.MaskShift;
   end
-(*
+  (*
   //TODO
   else if riqfGrey in AFlags
   then begin
@@ -612,9 +617,10 @@ begin
     ADesc.RedPrec := 8;
     ADesc.RedShift := 0;
   end
-*)
-  else if riqfRGB in AFlags
-  then begin
+  *)
+  else
+  if riqfRGB in AFlags then
+  begin
     ADesc.Format := ricfRGBA;
     ADesc.Depth := Desc.Depth;
     ADesc.BitOrder := Desc.BitOrder;
@@ -630,14 +636,14 @@ begin
     ADesc.BlueShift := Desc.BlueShift;
   end;
 
-  if riqfAlpha in AFlags
-  then begin
+  if riqfAlpha in AFlags then
+  begin
     ADesc.AlphaPrec := Desc.AlphaPrec;
     ADesc.AlphaShift := Desc.AlphaShift;
   end;
 
-  if riqfMask in AFlags
-  then begin
+  if riqfMask in AFlags then
+  begin
     ADesc.MaskBitsPerPixel := Desc.MaskBitsPerPixel;
     ADesc.MaskShift := Desc.MaskShift;
     ADesc.MaskLineEnd := Desc.MaskLineEnd;