From 6ac8338ecf3893e90679fcc54535b8dbe2b9c4a2 Mon Sep 17 00:00:00 2001
From: zeljko <zeljko@lazarus-ide.org>
Date: Mon, 30 Aug 2010 09:52:05 +0000
Subject: [PATCH] Qt: assign qt font when not owning painter instead of setting
 new font for QPainter. fixes #16646

git-svn-id: trunk@27236 -
---
 lcl/interfaces/qt/qtobjects.pas | 42 +++++++++++++++++++++++----------
 1 file changed, 30 insertions(+), 12 deletions(-)

diff --git a/lcl/interfaces/qt/qtobjects.pas b/lcl/interfaces/qt/qtobjects.pas
index 8635ce4695..18b258806b 100644
--- a/lcl/interfaces/qt/qtobjects.pas
+++ b/lcl/interfaces/qt/qtobjects.pas
@@ -740,6 +740,8 @@ function Clipboard: TQtClipboard;
 function QtDefaultContext: TQtDeviceContext;
 function QtScreenContext: TQtDeviceContext;
 
+procedure AssignQtFont(FromFont: QFontH; ToFont: QFontH);
+
 implementation
 
 uses
@@ -831,6 +833,25 @@ begin
   Result := FScreenContext;
 end;
 
+procedure AssignQtFont(FromFont: QFontH; ToFont: QFontH);
+var
+  FntFam: WideString;
+begin
+  QFont_family(FromFont, @FntFam);
+  QFont_setFamily(ToFont, @FntFam);
+  if QFont_pixelSize(FromFont) > 0 then
+    QFont_setPixelSize(ToFont, QFont_pixelSize(FromFont))
+  else
+    QFont_setPointSize(ToFont, QFont_pointSize(FromFont));
+  QFont_setWeight(ToFont, QFont_weight(FromFont));
+  QFont_setBold(ToFont, QFont_bold(FromFont));
+  QFont_setItalic(ToFont, QFont_italic(FromFont));
+  QFont_setUnderline(ToFont, QFont_underline(FromFont));
+  QFont_setStrikeOut(ToFont, QFont_strikeOut(FromFont));
+  QFont_setStyle(ToFont, QFont_style(FromFont));
+  QFont_setStyleStrategy(ToFont, QFont_styleStrategy(FromFont));
+end;
+
 { TQtObject }
 
 constructor TQtObject.Create;
@@ -2303,17 +2324,7 @@ end;
 
 function TQtDeviceContext.GetMetrics: TQtFontMetrics;
 begin
-  {$note this is workaround for qt bug when QPainter refuses to
-   set font (Vista & Win7 themes).See #16646.
-   No harm for other platforms with this patch.}
-  if FOwnPainter then
-    Result := Font.Metrics
-  else
-  begin
-    if FMetrics = nil then
-      FMetrics := TQtFontMetrics.Create(QPainter_font(Widget));
-    Result := FMetrics;
-  end;
+  Result := Font.Metrics
 end;
 
 {------------------------------------------------------------------------------
@@ -2635,6 +2646,8 @@ end;
   Returns: Nothing
  ------------------------------------------------------------------------------}
 procedure TQtDeviceContext.setFont(AFont: TQtFont);
+var
+  QFnt: QFontH;
 begin
   {$ifdef VerboseQt}
   Write('TQtDeviceContext.setFont() ');
@@ -2642,7 +2655,12 @@ begin
   SelFont := AFont;
   if (AFont.Widget <> nil) and (Widget <> nil) then
   begin
-    QPainter_setFont(Widget, QFontH(AFont.Widget));
+    if not FOwnPainter then
+    begin
+      QFnt := QPainter_font(Widget);
+      AssignQtFont(AFont.Widget, QFnt);
+    end else
+      QPainter_setFont(Widget, QFontH(AFont.Widget));
     vFont.Angle := AFont.Angle;
   end;
 end;