Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 2 additions & 26 deletions Src/LexText/Lexicon/FLExBridgeListener.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
using SIL.Lift.Migration;
using SIL.Lift.Parsing;
using SIL.IO;
using SIL.PlatformUtilities;
using XCore;

namespace SIL.FieldWorks.XWorks.LexEd
Expand Down Expand Up @@ -152,21 +151,7 @@ public bool OnDisplayFLExLiftBridge(object parameters, ref UIItemDisplayProperti
/// <returns></returns>
public bool OnFLExLiftBridge(object commandObject)
{
if (Platform.IsMono)
{
// This is a horrible workaround for a nasty bug in Mono. The toolbar button captures the mouse,
// and does not release it before calling this event handler. If we proceed to run the bridge,
// which freezes our UI thread until FlexBridge returns, the mouse stays captured...and the whole
// system UI is frozen, for all applications.
_mediator.IdleQueue.Add(IdleQueuePriority.High,
obj =>
{
RunFLExLiftBridge(commandObject);
return true; // task is complete, don't try again, remove from idle queue.
});
}
else
RunFLExLiftBridge(commandObject); // on windows we can safely do it right away.
RunFLExLiftBridge(commandObject);
return true; // we handled it
}

Expand Down Expand Up @@ -548,16 +533,7 @@ private void ValidatePendingEditorData()
/// </summary>
public bool OnDisplayCheckForFlexBridgeUpdates(object commandObject, ref UIItemDisplayProperties display)
{
if (Platform.IsUnix)
{
display.Visible = false;
display.Enabled = false;
}
else
{
CheckForFlexBridgeInstalledAndSetMenuItemProperties(display);
}

CheckForFlexBridgeInstalledAndSetMenuItemProperties(display);
return true; // We dealt with it.
}

Expand Down
Loading