diff options
| author | Graeme Geldenhuys <graemeg@gmail.com> | 2015-08-31 21:03:30 +0100 |
|---|---|---|
| committer | Graeme Geldenhuys <graemeg@gmail.com> | 2015-08-31 21:03:30 +0100 |
| commit | 062abd535a5976db90812543c38035aa0d8990f9 (patch) | |
| tree | 113aae485380f3e0ac8628be5135c35a1fa2dbef /src | |
| parent | e12ff50eb77258091f8a2c147437d3b8a1aba247 (diff) | |
| parent | efd755cc889d2e1e73b629c7034e15b77d2e3dfb (diff) | |
| download | fpGUI-062abd535a5976db90812543c38035aa0d8990f9.tar.xz | |
Merge branch 'jm-colorwheel' into fixes_1.4
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/fpg_colormapping.pas | 2 | ||||
| -rw-r--r-- | src/gui/fpg_listbox.pas | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/fpg_colormapping.pas b/src/gui/fpg_colormapping.pas index a22b949e..9e736e4b 100644 --- a/src/gui/fpg_colormapping.pas +++ b/src/gui/fpg_colormapping.pas @@ -54,7 +54,7 @@ begin hi := max(max(r, g), b); lo := min(min(r, g), b); d := hi - lo; - Value := hi / 256; + Value := hi / 255; if d > 0 then begin if r = hi then diff --git a/src/gui/fpg_listbox.pas b/src/gui/fpg_listbox.pas index d876a222..80c836a0 100644 --- a/src/gui/fpg_listbox.pas +++ b/src/gui/fpg_listbox.pas @@ -236,6 +236,8 @@ type property Items; property ParentShowHint; property PopupFrame; + property ScrollBarPage; + property ScrollBarWidth; property ShowColorNames; property ShowHint; property TabOrder; |