erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-10-16 10:57:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

Merge remote-tracking branch 'origin/stable-12.0' into android-fix-left-deletions

Browse source
This commit is contained in:
Darcy Wong 2019-11-18 11:22:41 +07:00
commit adffc42b8d
7 changed files with 85 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
windows/src/desktop/history.md
View file

@ -3,6 +3,9 @@
## 13.0 alpha
* Start version 13.0
## 2019-11-15 12.0.54 stable
* Bug Fix: On Screen Keyboard restored to wrong screen and position when reloading (#2330)
## 2019-11-12 12.0.53 stable
* Bug Fix: Address instability when exiting Keyman on some systems (#2324)
* Bug Fix: Keyman was not working with Skype, Windows Search on some systems (#2324)

33
windows/src/developer/TIKE/compile/MergeKeyboardInfo.pas
View file

@ -326,9 +326,11 @@ begin
SetLength(FPackageJSFileInfos, Length(FPackageJSFileInfos)+1);
FPackageJSFileInfos[High(FPackageJSFileInfos)].Filename := Zip.FileNames[j];
// For now, apply JS keyboard to all web and mobile targets
// Apply JS keyboard only to mobile targets, because web is not supported
// in a package. If a package does not support mobile, it should not include
// the .js.
// Not using GetKeyboardInfo because that only handles kmx files
FPackageJSFileInfos[High(FPackageJSFileInfos)].Info.Targets := 'web mobile';
FPackageJSFileInfos[High(FPackageJSFileInfos)].Info.Targets := 'mobile';
end;
end;
end;
@ -975,8 +977,6 @@ begin
AddNewPair('windows', 'full');
AddNewPair('macos', 'full');
AddNewPair('linux', 'full');
AddNewPair('desktopWeb', 'full');
AddNewPair('mobileWeb', 'full');
AddNewPair('android', 'full');
AddNewPair('ios', 'full');
end
@ -1007,11 +1007,6 @@ begin
// FPackageKMXFileInfos can contain target information for web/mobile targets.
// This is a current limitation of FPackageJSFileInfos if there's no kmx files
if target = ktWeb then
begin
AddNewPair('desktopWeb', 'full');
AddNewPair('mobileWeb', 'full');
end;
if (target = ktMobile) then
begin
AddNewPair('android', 'full');
@ -1034,11 +1029,6 @@ begin
targets := StringToKeymanTargets(keyboardFile.Info.Targets);
for target in targets do
begin
if (target = ktWeb) then
begin
AddNewPair('desktopWeb', 'full');
AddNewPair('mobileWeb', 'full');
end;
if (target = ktMobile) then
begin
AddNewPair('android', 'full');
@ -1055,16 +1045,17 @@ begin
end;
end;
// Handle JS file not in kmp
if FJsFile <> '' then
// Handle JS file not in kmp. Because it is isolated, we cannot detect
// whether it supports mobile vs desktop web because that is not included
// in the .js. So, for now we assume both.
//
// We no longer assume that the presence of a .js means support for
// native mobile apps. These apps now work on the basis of having a
// .kmp file available
if (FJsFile <> '') then
begin
AddNewPair('desktopWeb', 'full');
AddNewPair('mobileWeb', 'full');
// TODO: Don't add Android and iOS when we complete the addition of all .js keyboards
// to packages in the repository (including legacy keyboards)
AddNewPair('android', 'full');
AddNewPair('ios', 'full');
end;
json.AddPair('platformSupport', v);

1
windows/src/developer/TIKE/main/Keyman.Developer.UI.UframeCEFHost.dfm
View file

@ -34,7 +34,6 @@ inherited frameCEFHost: TframeCEFHost
Top = 208
end
object cef: TChromium
OnWidgetCompMsg = cefWidgetCompMsg
OnLoadEnd = cefLoadEnd
OnSetFocus = cefSetFocus
OnRunContextMenu = cefRunContextMenu

29
windows/src/developer/TIKE/main/Keyman.Developer.UI.UframeCEFHost.pas
View file

@ -35,7 +35,6 @@ const
CEF_AFTERCREATE = WM_USER + 302;
CEF_SHOW = WM_USER + 303;
CEF_LOADEND = WM_USER + 304;
CEF_SETFOCUS = WM_USER + 305;
CEF_KEYEVENT = WM_USER + 306;
CEF_BEFOREBROWSE = WM_USER + 307;
CEF_CONSOLEMESSAGE = WM_USER + 308;
@ -106,7 +105,6 @@ type
var settings: TCefBrowserSettings;
var noJavascriptAccess: Boolean;
var Result: Boolean);
procedure cefWidgetCompMsg(var aMessage: TMessage; var aHandled: Boolean);
procedure cefSetFocus(Sender: TObject; const browser: ICefBrowser;
source: TCefFocusSource; out Result: Boolean);
private
@ -134,7 +132,6 @@ type
procedure Handle_CEF_AFTERCREATE(var Message: TMessage);
procedure Handle_CEF_SHOW(var message: TMessage);
procedure Handle_CEF_LOADEND(var message: TMessage);
procedure Handle_CEF_SETFOCUS(var message: TMessage);
procedure Handle_CEF_KEYEVENT(var message: TMessage);
procedure Handle_CEF_BEFOREBROWSE(var message: TMessage);
procedure Handle_CEF_CONSOLEMESSAGE(var message: TMessage);
@ -268,14 +265,6 @@ begin
CreateBrowser;
end;
procedure TframeCEFHost.cefWidgetCompMsg(var aMessage: TMessage;
var aHandled: Boolean);
begin
AssertCefThread;
if aMessage.Msg = WM_SETFOCUS then
PostMessage(FCallbackWnd, CEF_SETFOCUS, 0, 0);
end;
procedure TframeCEFHost.CreateBrowser;
begin
AssertVclThread;
@ -308,9 +297,11 @@ end;
procedure TframeCEFHost.SetFocus;
begin
AssertVclThread;
inherited;
if not FIsClosing and cefwp.CanFocus then
cefwp.SetFocus;
if not FIsClosing and cefwp.CanFocus and Assigned(cef) then
begin
GetParentForm(Self).ActiveControl := Self;
cef.SetFocus(True);
end;
end;
procedure TframeCEFHost.CallbackWndProc(var Message: TMessage);
@ -322,7 +313,6 @@ begin
CEF_AFTERCREATE: Handle_CEF_AFTERCREATE(Message);
CEF_SHOW: Handle_CEF_SHOW(Message);
CEF_LOADEND: Handle_CEF_LOADEND(Message);
CEF_SETFOCUS: Handle_CEF_SETFOCUS(Message);
CEF_KEYEVENT: Handle_CEF_KEYEVENT(Message);
CEF_BEFOREBROWSE: Handle_CEF_BEFOREBROWSE(Message);
CEF_CONSOLEMESSAGE: Handle_CEF_CONSOLEMESSAGE(Message);
@ -534,13 +524,6 @@ begin
FOnLoadEnd(Self);
end;
procedure TframeCEFHost.Handle_CEF_SETFOCUS(var message: TMessage);
begin
AssertVclThread;
if Assigned(cefwp) and cefwp.Visible and cefwp.CanFocus then
GetParentForm(cefwp).ActiveControl := cefwp;
end;
procedure TframeCEFHost.cefPreKeyEvent(Sender: TObject;
const browser: ICefBrowser; const event: PCefKeyEvent; osEvent: PMsg;
out isKeyboardShortcut, Result: Boolean);
@ -614,7 +597,7 @@ end;
procedure TframeCEFHost.cefSetFocus(Sender: TObject; const browser: ICefBrowser;
source: TCefFocusSource; out Result: Boolean);
begin
Result := source <> FOCUS_SOURCE_NAVIGATION;
Result := source = FOCUS_SOURCE_NAVIGATION;
end;
procedure TframeCEFHost.WMEnterMenuLoop(var aMessage: TMessage);

1
windows/src/developer/TIKE/main/UframeTextEditor.pas
View file

@ -656,7 +656,6 @@ end;
procedure TframeTextEditor.SetFocus;
begin
inherited;
cef.SetFocus;
end;

8
windows/src/developer/history.md
View file

@ -3,6 +3,12 @@
## 13.0 alpha
* Start version 13.0
## 2019-11-18 12.0.55 stable
* Bug Fix: Some keyboards were incorrectly marked as mobile-capable (#2334)
## 2019-11-15 12.0.54 stable
* Bug Fix: Text editor and other controls did not receive focus correctly (#2331)
## 2019-10-07 12.0.50 stable
* Release 12.0
@ -806,4 +812,4 @@
* Modern Windows Installer for straightforward deployment
* Windows Vista support
* Unicode support throughout Keyman Developer
* Automated online updates
* Automated online updates

62
windows/src/engine/keyman/viskbd/UfrmVisualKeyboard.pas
View file

@ -280,6 +280,8 @@ type
implementation
uses
System.Types,
CommCtrl,
GraphUtil,
KeymanHints,
@ -303,7 +305,7 @@ uses
VistaMessages,
MessageIdentifierConsts,
messageidentifiers,
BitmapIPicture, Types;
BitmapIPicture;
{$R *.DFM}
@ -1331,12 +1333,62 @@ begin
end;
procedure TfrmVisualKeyboard.LoadSettings;
procedure MoveBounds(R: TRect);
function FitRectInBounds(R, BR: TRect): TRect;
begin
if (R.Left < R.Right) and (R.Top < R.Bottom) and (R.Left >= 0) and (R.Top >= 0) and
(R.Bottom <= Screen.Height) and (R.Right <= Screen.Width) then
BoundsRect := R;
if R.Width > BR.Width then
R.Width := BR.Width;
if R.Height > BR.Height then
R.Height := BR.Height;
if R.Left < BR.Left then
R.Offset(BR.Left-R.Left, 0);
if R.Right > BR.Right then
R.Offset(BR.Right-R.Right, 0);
if R.Top < BR.Top then
R.Offset(0, BR.Top-R.Top);
if R.Bottom > BR.Bottom then
R.Offset(0, BR.Bottom-R.Bottom);
Result := R;
end;
procedure MoveBounds(R: TRect);
var
area, i: Integer;
m: Integer;
BR, RI: TRect;
begin
// Adjust the rectangle to ensure TopLeft <= BottomRight
R.NormalizeRect;
// Move the rect onto the screen (e.g. when monitor is disconnected,
// we don't want to show the OSK off the screen). It is valid for the window
// rect to go negative, if for example primary monitor is not left-most.
// If the OSK is partially on-screen, move it onto the monitor where it has
// the most real-estate.
m := 0; area := 0;
for i := 0 to Screen.MonitorCount - 1 do
begin
if System.Types.IntersectRect(RI, R, Screen.Monitors[i].BoundsRect) then
begin
if RI.Width * RI.Height > area then
begin
area := RI.Width * RI.Height;
m := i;
end;
end;
end;
BR := Screen.Monitors[m].WorkareaRect;
Self.BoundsRect := FitRectInBounds(R, BR);
end;
procedure MoveDefault;
begin
SetBounds(Screen.WorkAreaRect.Right - Width, Screen.WorkAreaRect.Bottom - Height, Width, Height);