diff options
| author | graemeg <graemeg@ae50a9b5-8222-0410-bf8d-8a13f76226bf> | 2008-02-05 10:52:03 +0000 |
|---|---|---|
| committer | graemeg <graemeg@ae50a9b5-8222-0410-bf8d-8a13f76226bf> | 2008-02-05 10:52:03 +0000 |
| commit | aa8e6c9b6d27812861350ac6d21690068b31f8f9 (patch) | |
| tree | 872f685a864ec34ef2f2ec93d226100fcd40c6a9 | |
| parent | 42e68e39cb7f0a790af45ef43dc81e4542638efc (diff) | |
| download | fpGUI-aa8e6c9b6d27812861350ac6d21690068b31f8f9.tar.xz | |
Applied patch from Slapshot fixing the TVFDPropertyEditor class. BackgroupColor property issue.
* I reverted the gui_memo.pas changes from r504 to fix a cursor focus issue when the memo contains no text. I will attend to this issue soon, so we don't have to force adding a blank line.
| -rw-r--r-- | examples/apps/uidesigner/newformdesigner.pas | 3 | ||||
| -rw-r--r-- | src/gui/gui_memo.pas | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/examples/apps/uidesigner/newformdesigner.pas b/examples/apps/uidesigner/newformdesigner.pas index 110a21ec..25fffc61 100644 --- a/examples/apps/uidesigner/newformdesigner.pas +++ b/examples/apps/uidesigner/newformdesigner.pas @@ -118,7 +118,6 @@ type editor: TVFDPropertyEditor; NameDrag: boolean; NameDragPos: integer; - BackgroundColor: TfpgColor; constructor Create(AOwner: TComponent); override; procedure ReleaseEditor; procedure AllocateEditor; @@ -753,7 +752,7 @@ begin Inc(x); // Drawing the contents r.SetRect(x, y, rect.right - x, rect.Height); - Canvas.SetColor(FBackgroundColor); + Canvas.SetColor(BackgroundColor); Canvas.FillRectangle(r); Canvas.SetTextColor(clText1); Inc(r.left, 2); diff --git a/src/gui/gui_memo.pas b/src/gui/gui_memo.pas index a925f2f2..599d3fd0 100644 --- a/src/gui/gui_memo.pas +++ b/src/gui/gui_memo.pas @@ -565,8 +565,8 @@ end; function TfpgMemo.GetLineText(linenum: integer): string; begin -{ if LineCount < 1 then - FLines.Add(''); } + if LineCount < 1 then + FLines.Add(''); if (linenum >= 1) and (linenum <= LineCount) then Result := FLines.Strings[linenum - 1] else |