paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-25 20:49:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Changed to the new interface

Browse Source
This commit is contained in:
sg 2000-01-31 19:26:13 +00:00
parent 8ef976f232
commit 7f002abbf9
1 changed files with 20 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
fcl/shedit/gtk/gtkshedit.pp
View File

@ -81,11 +81,10 @@ type
// ISHWidget Implemenation: // ISHWidget Implemenation:
procedure InvalidateRect(x1, y1, x2, y2: Integer); override; procedure InvalidateRect(x, y, w, h: Integer); override;
procedure InvalidateLines(y1, y2: Integer); override;
// Drawing // Drawing
procedure ClearRect(x1, y1, x2, y2: Integer); override; procedure ClearRect(x, y, w, h: Integer); override;
procedure DrawTextLine(x1, x2, y: Integer; s: PChar); override; procedure DrawTextLine(x1, x2, y: Integer; s: PChar); override;
// Cursor // Cursor
@ -131,17 +130,13 @@ implementation
procedure TGtkSHWidget_Expose(GtkWidget: PGtkWidget; event: PGdkEventExpose; procedure TGtkSHWidget_Expose(GtkWidget: PGtkWidget; event: PGdkEventExpose;
widget: TGtkSHWidget); cdecl; widget: TGtkSHWidget); cdecl;
var var
x1, y1, x2, y2: Integer; x, y, w, h: Integer;
begin begin
x1 := event^.area.x; x := (event^.area.x - widget.LeftIndent) div widget.CharW;
if x1 > 0 then y := event^.area.y div widget.CharH;
Dec(x1, widget.LeftIndent); w := (event^.area.x + event^.area.width + widget.CharW - 1) div widget.CharW - x;
x2 := x1 + event^.area.width - 1; h := (event^.area.y + event^.area.height + widget.CharH - 1) div widget.CharH - y;
x1 := x1 div widget.CharW; // WriteLn(Format('Expose(%d/%d, %dx%d) for %s', [x, y, w, h, FEdit.ClassName]));
x2 := (x2 + widget.CharW - 1) div widget.CharW;
y1 := event^.area.y div widget.CharH;
y2 := (event^.area.y + event^.area.height - 1) div widget.CharH;
// WriteLn(Format('Expose(%d/%d - %d/%d) for %s', [x1, y1, x2, y2, FEdit.ClassName]));
widget.GdkWnd := widget.PaintBox^.window; widget.GdkWnd := widget.PaintBox^.window;
widget.GC := gdk_gc_new(widget.GdkWnd); widget.GC := gdk_gc_new(widget.GdkWnd);
@ -150,7 +145,7 @@ begin
fg_gc[widget.PaintBox^.state]); fg_gc[widget.PaintBox^.state]);
widget.FEdit.AdjustCursorToRange; widget.FEdit.AdjustCursorToRange;
widget.FEdit.DrawContent(x1, y1, x2, y2); widget.FEdit.DrawContent(x, y, w, h);
end; end;
@ -357,37 +352,22 @@ begin
end; end;
procedure TGtkSHWidget.ClearRect(x1, y1, x2, y2: Integer); procedure TGtkSHWidget.ClearRect(x, y, w, h: Integer);
begin begin
SetGCColor(SHStyles^[shWhitespace].Background); SetGCColor(SHStyles^[shWhitespace].Background);
gdk_draw_rectangle(PGdkDrawable(GdkWnd), GC, 1, gdk_draw_rectangle(PGdkDrawable(GdkWnd), GC, 1,
x1 * CharW + LeftIndent, y1 * CharH, x * CharW + LeftIndent, y * CharH, w * CharW, h * CharH);
(x2 - x1 + 1) * CharW, (y2 - y1 + 1) * CharH);
end; end;
procedure TGtkSHWidget.InvalidateRect(x1, y1, x2, y2: Integer); procedure TGtkSHWidget.InvalidateRect(x, y, w, h: Integer);
var var
r : TGdkRectangle; r : TGdkRectangle;
begin begin
r.x := x1 * CharW + LeftIndent; r.x := x * CharW + LeftIndent;
r.y := y1 * CharH; r.y := y * CharH;
r.Width := (x2 - x1 + 1) * CharW; r.Width := w * CharW;
r.Height := (y2 - y1 + 1) * CharH; r.Height := h * CharH;
gtk_widget_draw(PGtkWidget(PaintBox), @r);
end;
procedure TGtkSHWidget.InvalidateLines(y1, y2: Integer);
var
r : TGdkRectangle;
w,h : integer;
begin
gdk_window_get_size(PGdkDrawable(GdkWnd), @w, @h);
r.x := 0;
r.y := y1 * CharH;
r.Width := w;
r.Height := (y2 - y1 + 1) * CharH;
gtk_widget_draw(PGtkWidget(PaintBox), @r); gtk_widget_draw(PGtkWidget(PaintBox), @r);
end; end;
@ -585,7 +565,10 @@ end.
{ {
$Log$ $Log$
Revision 1.2 2000-01-07 01:24:34 peter Revision 1.3 2000-01-31 19:26:13 sg
* Changed to the new interface
Revision 1.2 2000/01/07 01:24:34 peter
* updated copyright to 2000 * updated copyright to 2000
Revision 1.1 2000/01/06 16:03:26 peter Revision 1.1 2000/01/06 16:03:26 peter