LCL, GTK2: Font with number got wrong size part 2, issue #21775, patch from G. Zakrzewski"

git-svn-id: trunk@38098 -

lcl/graphics.pp

@@ -1946,7 +1946,7 @@ function ClearXLFDPitch(const LongFontName: string): string;
 function ClearXLFDStyle(const LongFontName: string): string;
 function XLFDHeightIsSet(const LongFontName: string): boolean;
 procedure FontNameToPangoFontDescStr(const LongFontName: string;
-  out aFamily,aStyle:String; out aSize: Integer);
+  out aFamily,aStyle:String; out aSize: Integer; out aSizeInPixels: Boolean);
 
 // graphics
 type

lcl/include/font.inc

@@ -514,7 +514,7 @@ end;
 // [SIZE]         is a decimal number (size in points) (... and points in PANGO_UNITS)
 // any of these options may be absent.
 procedure FontNameToPangoFontDescStr(const LongFontName: string;
-  out aFamily,aStyle: string; out aSize: Integer);
+  out aFamily,aStyle: string; out aSize: Integer; out aSizeInPixels: Boolean);
 
 var
   ParsePos: Integer;
@@ -533,7 +533,7 @@ var
   function GetSize: string;
   var
     c: char;
-    validblank: boolean;
+    ValidBlank, CheckPixelsNeeded: boolean;
     InitPos: Integer;
     
     function IsBlank: boolean;
@@ -548,7 +548,8 @@ var
     
   begin
     Result := '';
-    validblank := true;
+    ValidBlank := True;
+    CheckPixelsNeeded := True;
     ParsePos := Length(LongFontname);
     InitPos := ParsePos;
     while ParsePos>0 do begin
@@ -560,16 +561,29 @@ var
           continue
         end else
           break;
-      ValidBlank := false;
+      ValidBlank := False;
+      if CheckPixelsNeeded then
+      begin
+        CheckPixelsNeeded := False;
+        aSizeInPixels := (ParsePos > 2) and (longFontName[ParsePos - 1] = 'p')
+          and (longFontName[ParsePos] = 'x');
+        if aSizeInPixels then
+        begin
+          dec(ParsePos, 2);
+          Continue;
+        end;
+      end;
       if IsDigit then begin
         Result := C + Result;
         dec(ParsePos);
       end else begin
-        if not IsBlank then
+        if not IsBlank and (C <> ',')then
         begin
           Result := '';
           ParsePos := InitPos;
         end;
+        if C = ',' then
+          dec(ParsePos);
         break;
       end;
     end;
@@ -579,6 +593,7 @@ begin
   aStyle := '';
   aFamily := '';
   aSize := 0;
+  aSizeInPixels := False;
   if IsFontNameXLogicalFontDesc(LongFontName) then begin
     aFamily := ExtractXLFDItem(LongFontName, XLFD_FAMILY);
     if aFamily='*' then

lcl/interfaces/gtk2/gtk2winapi.inc

@@ -1355,6 +1355,7 @@ var
   GdiObject: PGdiObject;
   FullString, aFamily, aStyle, ALongFontName: String;
   aSize: Integer;
+  aSizeInPixels: Boolean;
   PangoDesc: PPangoFontDescription;
   CachedFont: TGtkFontCacheDescriptor;
   AttrList: PPangoAttrList;
@@ -1410,7 +1411,7 @@ begin
         exit;
       end;
 
-      FontNameToPangoFontDescStr(ALongFontname, aFamily, aStyle, aSize);
+      FontNameToPangoFontDescStr(ALongFontname, aFamily, aStyle, aSize, aSizeInPixels);
 
       // if font specified size, prefer this instead of 'possibly' inaccurate
       // lfHeight note that lfHeight may actually have a most accurate value
@@ -1450,19 +1451,28 @@ begin
         FullString := '10' // use some default: TODO: find out the default size of the widget
       else
       if aSize > 0 then
-        FullString := IntToStr(aSize)
+      begin
+        FullString := IntToStr(aSize);
+        if aSizeInPixels then
+          FullString := FullString + 'px';
+      end
       else
         FullString := '';
 
-      FullString := AFamily + ', ' + aStyle + ' ' + FullString;
+      if Pos(',', AFamily) > 0 then
+        FullString := AFamily + ' ' + aStyle + ' ' + FullString
+      else
+        FullString := AFamily + ', ' + aStyle + ' ' + FullString;
       PangoDesc := pango_font_description_from_string(PChar(FullString));
 
-      if lfWeight <> FW_DONTCARE then
+      if (pango_font_description_get_weight(PangoDesc) = PANGO_WEIGHT_NORMAL)
+        and (lfWeight <> FW_DONTCARE) then
         pango_font_description_set_weight(PangoDesc, lfWeight);
 
-      if lfItalic <> 0 then
+      if (pango_font_description_get_style (PangoDesc) = PANGO_STYLE_NORMAL)
+          and (lfItalic <> 0) then
         pango_font_description_set_style(PangoDesc, PANGO_STYLE_ITALIC);
-
+      aStyle := pango_font_description_to_string(PangoDesc);
       if (aSize=0) and (lfHeight<>0) then
       begin
         // a size is not specified, try to calculate one based on lfHeight