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

richmemo: gtk2 correct returning metric parameter of the paragraph. Result functions for getpararange

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3793 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
skalogryz
2014-11-27 06:12:18 +00:00
parent ba9e51eaa5
commit 6c9f217f74
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -360,11 +360,17 @@ begin
GtkTextAttrToFontParams(attr^, fp); GtkTextAttrToFontParams(attr^, fp);
Result := Assigned(attr); Result := Assigned(attr);
if Result then begin if Result then begin
if attr^.indent<0 then begin
AMetric.FirstLine:=(attr^.left_margin)*PixToPt;
AMetric.HeadIndent:=(-attr^.indent+attr^.left_margin)*PixToPt;
end else begin
AMetric.FirstLine:=(attr^.left_margin+attr^.indent)*PixToPt;
AMetric.HeadIndent:=attr^.left_margin*PixToPt;
end;
AMetric.TailIndent:=attr^.right_margin*PixToPt;
AMetric.SpaceAfter:=attr^.pixels_above_lines*PixToPt; AMetric.SpaceAfter:=attr^.pixels_above_lines*PixToPt;
AMetric.SpaceBefore:=attr^.pixels_below_lines*PixToPt; AMetric.SpaceBefore:=attr^.pixels_below_lines*PixToPt;
AMetric.FirstLine:=attr^.indent*PixToPt;
AMetric.HeadIndent:=attr^.left_margin*PixToPt;
AMetric.TailIndent:=attr^.right_margin*PixToPt;
AMetric.LineSpacing:=(attr^.pixels_inside_wrap*PixToPt+fp.Size)/(fp.Size); AMetric.LineSpacing:=(attr^.pixels_inside_wrap*PixToPt+fp.Size)/(fp.Size);
gtk_text_attributes_unref(attr); gtk_text_attributes_unref(attr);
end; end;
@ -431,7 +437,10 @@ var
iend : TGtkTextIter; iend : TGtkTextIter;
begin begin
GetWidgetBuffer(AWinControl, w, b); GetWidgetBuffer(AWinControl, w, b);
if not Assigned(b) then Exit; if not Assigned(b) then begin
Result:=false;
Exit;
end;
gtk_text_buffer_get_iter_at_offset (b, @istart, TextStart); gtk_text_buffer_get_iter_at_offset (b, @istart, TextStart);
gtk_text_buffer_get_iter_at_offset (b, @iend, TextStart); gtk_text_buffer_get_iter_at_offset (b, @iend, TextStart);
gtk_text_iter_set_line_offset(@istart, 0); gtk_text_iter_set_line_offset(@istart, 0);
@ -439,8 +448,10 @@ begin
rng.start:=gtk_text_iter_get_offset(@istart); rng.start:=gtk_text_iter_get_offset(@istart);
rng.lenghtNoBr:=gtk_text_iter_get_offset(@iend)-rng.start; rng.lenghtNoBr:=gtk_text_iter_get_offset(@iend)-rng.start;
gtk_text_iter_forward_char(@iend); // if there's a character to move, then it's end of line, if not then it won't change! // if there's a character to move, then it's end of line, if not then it won't change!
gtk_text_iter_forward_char(@iend);
rng.length:=gtk_text_iter_get_offset(@iend)-rng.start; rng.length:=gtk_text_iter_get_offset(@iend)-rng.start;
Result:=true;
end; end;
class procedure TGtk2WSCustomRichMemo.InDelText(const AWinControl: TWinControl; class procedure TGtk2WSCustomRichMemo.InDelText(const AWinControl: TWinControl;