pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

richmemo: gtk2 update getting paragraph metric

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3796 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
skalogryz
2014-11-27 06:36:15 +00:00
parent 0acaefb4b5
commit f9e3db6342
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/richmemo/gtk2/gtk2richmemo.pas
View File

@ -43,7 +43,7 @@ type
protected protected
class procedure SetCallbacks(const AGtkWidget: PGtkWidget; const AWidgetInfo: PWidgetInfo); class procedure SetCallbacks(const AGtkWidget: PGtkWidget; const AWidgetInfo: PWidgetInfo);
class procedure GetWidgetBuffer(const AWinControl: TWinControl; var TextWidget: PGtkWidget; var Buffer: PGtkTextBuffer); class procedure GetWidgetBuffer(const AWinControl: TWinControl; var TextWidget: PGtkWidget; var Buffer: PGtkTextBuffer);
class function GetAttrAtPos(const AWinControl: TWinControl; TextStart: Integer): PGtkTextAttributes; class function GetAttrAtPos(const AWinControl: TWinControl; TextStart: Integer; APara: Boolean = false): PGtkTextAttributes;
class procedure ApplyTag(abuffer: PGtkTextBuffer; tag: PGtkTextTag; TextStart, TextLen: Integer; ToParagraphs: Boolean = False); class procedure ApplyTag(abuffer: PGtkTextBuffer; tag: PGtkTextTag; TextStart, TextLen: Integer; ToParagraphs: Boolean = False);
published published
@ -155,7 +155,7 @@ begin
end; end;
class function TGtk2WSCustomRichMemo.GetAttrAtPos( class function TGtk2WSCustomRichMemo.GetAttrAtPos(
const AWinControl: TWinControl; TextStart: Integer): PGtkTextAttributes; const AWinControl: TWinControl; TextStart: Integer; APara: Boolean ): PGtkTextAttributes;
var var
TextWidget : PGtkWidget; TextWidget : PGtkWidget;
buffer : PGtkTextBuffer; buffer : PGtkTextBuffer;
@ -169,6 +169,7 @@ begin
if not Assigned(attr) then Exit; if not Assigned(attr) then Exit;
gtk_text_buffer_get_iter_at_offset(buffer, @iter, TextStart); gtk_text_buffer_get_iter_at_offset(buffer, @iter, TextStart);
if APara then gtk_text_iter_set_line_offset(@iter, 0);
gtk_text_iter_get_attributes(@iter, attr); gtk_text_iter_get_attributes(@iter, attr);
Result:=attr; Result:=attr;
end; end;
@ -306,7 +307,7 @@ class function TGtk2WSCustomRichMemo.GetParaAlignment(
var var
attr : PGtkTextAttributes; attr : PGtkTextAttributes;
begin begin
attr:=GetAttrAtPos(AWinControl, TextStart); attr:=GetAttrAtPos(AWinControl, TextStart, true);
Result := Assigned(attr); Result := Assigned(attr);
if Result then begin if Result then begin
case attr^.justification of case attr^.justification of
@ -356,7 +357,7 @@ const
PageDPI = 72; // not expected to be changed PageDPI = 72; // not expected to be changed
PixToPt = PageDPI / ScreenDPI; PixToPt = PageDPI / ScreenDPI;
begin begin
attr:=GetAttrAtPos(AWinControl, TextStart); attr:=GetAttrAtPos(AWinControl, TextStart, true);
GtkTextAttrToFontParams(attr^, fp); GtkTextAttrToFontParams(attr^, fp);
Result := Assigned(attr); Result := Assigned(attr);
if Result then begin if Result then begin