erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-09-26 01:27:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 19

Merge pull request #3719 from keymanapp/fix/windows/3694-tweak-scrolling-in-keyboard-menu

Browse source 
fix(windows): tweak scrolling in keyboard menu
This commit is contained in:
Marc Durdin 2020-10-20 18:31:21 +11:00 • committed by GitHub
commit 3d324b20aa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
windows/src/engine/keyman/UfrmKeymanMenu.pas
View file

@ -362,11 +362,12 @@ end;
procedure TfrmKeymanMenu.PopupEx(mnu: TPopupMenu; X, Y: Integer; IconRect: TRect); // I3990
var
kmi: TKeymanMenuItem;
i, ItemWidth, ItemHeight: Integer;
i, ItemWidth, ItemHeight, TempItemHeight: Integer;
v: Integer;
begin
Fmnu := mnu;
MaxScrollPosition := 0;
MaxKeyboardWidth := 0;
MaxItemWidth := 0;
TotalKeyboardHeight := 0;
@ -411,7 +412,6 @@ begin
MaxKeyboardWidth := ItemWidth;
Inc(TotalKeyboardHeight, ItemHeight);
Inc(MaxScrollPosition);
end
else
begin
@ -426,8 +426,6 @@ begin
end;
end;
Dec(MaxScrollPosition); // Don't allow scroll off the end of the list
//
// Do we need scrollable keyboard list? Only if it's greater than 75% of screen height
//
@ -436,6 +434,26 @@ begin
if ScrollableView then
begin
TotalKeyboardHeight := Screen.Height * 3 div 4;
// Calculate the maximum scroll
TempItemHeight := 0;
for i := Fmnu.Items.Count - 1 downto 0 do
begin
if Fmnu.Items[i] is TKeymanMenuItem then
begin
kmi := Fmnu.Items[i] as TKeymanMenuItem;
kmi.OnMeasureItem(kmi, Canvas, ItemWidth, ItemHeight);
if (kmi.CMIItemType = _mitKeyboardsList) then
begin
Inc(TempItemHeight, ItemHeight);
if TempItemHeight > TotalKeyboardHeight - ScrollBoxHeight*2 then
begin
MaxScrollPosition := i + 1;
Break;
end;
end;
end;
end;
end;
if not FIsKeyboardMenu then
@ -726,18 +744,6 @@ begin
if not Assigned(Fmnu) or not Assigned(Fmnu.Items) then Exit; // I2884
case Key of
{VK_NEXT:
begin
Key := 0;
if ScrollableView and (ScrollPosition < MaxScrollPosition) then
Inc(ScrollPosition);
end;
VK_PRIOR:
begin
Key := 0;
if ScrollableView and (ScrollPosition > 0) then
Dec(ScrollPosition);
end;}
VK_UP:
begin
Key := 0;
@ -819,7 +825,8 @@ begin
if FSelectedItemIndex < ScrollPosition then
ScrollPosition := FSelectedItemIndex
else
while FItemRects[FSelectedItemIndex].Top + FItemOffsets[FSelectedItemIndex] < 0 do
while (FItemRects[FSelectedItemIndex].Top + FItemOffsets[FSelectedItemIndex] < 0) or
(FItemRects[FSelectedItemIndex].Bottom + FItemOffsets[FSelectedItemIndex] > ScrollRects[1].Top) do
begin
Inc(ScrollPosition);
RecalculateScrollPositions;