diff options
| author | graemeg <graemeg@ae50a9b5-8222-0410-bf8d-8a13f76226bf> | 2008-05-27 09:15:42 +0000 |
|---|---|---|
| committer | graemeg <graemeg@ae50a9b5-8222-0410-bf8d-8a13f76226bf> | 2008-05-27 09:15:42 +0000 |
| commit | ef4adc6f504d55646e8ac06ae8d77f8f1a4cc955 (patch) | |
| tree | 7ebf811f04840f57503551d40fe82cdebf56cc35 /src/corelib | |
| parent | dd609c22ecfe937ecd7d7b35747ab5b20caeee23 (diff) | |
| download | fpGUI-ef4adc6f504d55646e8ac06ae8d77f8f1a4cc955.tar.xz | |
* Applied Vladimir's button flag patch.
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/fpgfx.pas | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/corelib/fpgfx.pas b/src/corelib/fpgfx.pas index d0d4001f..bc2fb866 100644 --- a/src/corelib/fpgfx.pas +++ b/src/corelib/fpgfx.pas @@ -29,8 +29,8 @@ type TAnchor = (anLeft, anRight, anTop, anBottom); TAnchors = set of TAnchor; - TFButtonFlags = set of (btnIsEmbedded, btnIsDefault, btnIsPressed, - btnIsSelected, btnHasFocus, btnHasParentColor); + TFButtonFlags = set of (btfIsEmbedded, btfIsDefault, btfIsPressed, + btfIsSelected, btfHasFocus, btfHasParentColor); TFTextFlags = set of (txtLeft, txtHCenter, txtRight, txtTop, txtVCenter, txtBottom, txtWrap, txtEnabled, txtAutoSize); @@ -1476,13 +1476,13 @@ var r: TfpgRect; begin r.SetRect(x, y, w, h); - if btnIsDefault in AFlags then + if btfIsDefault in AFlags then begin ACanvas.SetColor(clBlack); ACanvas.SetLineStyle(1, lsSolid); ACanvas.DrawRectangle(r); InflateRect(r, -1, -1); - Exclude(AFlags, btnIsDefault); + Exclude(AFlags, btfIsDefault); fpgStyle.DrawButtonFace(ACanvas, r.Left, r.Top, r.Width, r.Height, AFlags); Exit; //==> end; @@ -1492,9 +1492,9 @@ begin ACanvas.FillRectangle(x, y, w, h); // Left and Top (outer) - if (btnIsPressed in AFlags) then + if (btfIsPressed in AFlags) then begin - if (btnIsEmbedded in AFlags) then + if (btfIsEmbedded in AFlags) then ACanvas.SetColor(clHilite2) else ACanvas.SetColor(clShadow2); @@ -1513,9 +1513,9 @@ begin //end; // Right and Bottom (outer) - if (btnIsPressed in AFlags) then + if (btfIsPressed in AFlags) then begin - if (btnIsEmbedded in AFlags) then + if (btfIsEmbedded in AFlags) then ACanvas.SetColor(clHilite1) else ACanvas.SetColor(clShadow2); @@ -1526,9 +1526,9 @@ begin ACanvas.DrawLine(r.Right, r.Bottom, r.Left-1, r.Bottom); // bottom // Right and Bottom (inner) - if btnIsPressed in AFlags then + if btfIsPressed in AFlags then begin - if (btnIsEmbedded in AFlags) then + if (btfIsEmbedded in AFlags) then ACanvas.SetColor(clButtonFace) else ACanvas.SetColor(clHilite1); |