linus/mpv.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

globalization bug fix

Browse Source
This commit is contained in:
Frank Skare
2021-07-01 16:30:55 +02:00
parent 3520ce6a3f
commit ce0dd9ceec
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Misc/CorePlayer.cs
View File

@@ -228,7 +228,8 @@ namespace mpvnet
float scale = Native.GetDPI(IntPtr.Zero) / 96.0f; float scale = Native.GetDPI(IntPtr.Zero) / 96.0f;
if (scale != 1) if (scale != 1)
conf = conf.Replace("console-scale=1", "console-scale=" + scale); conf = conf.Replace("console-scale=1", "console-scale=" +
scale.ToString(CultureInfo.InvariantCulture));
File.WriteAllText(_ConfigFolder + "mpv.conf", conf); File.WriteAllText(_ConfigFolder + "mpv.conf", conf);
} }
@@ -740,7 +741,7 @@ namespace mpvnet
public void set_property_bool(string name, bool value, bool throwException = false) public void set_property_bool(string name, bool value, bool throwException = false)
{ {
long val = (value) ? 1 : 0; long val = value ? 1 : 0;
mpv_error err = mpv_set_property(Handle, GetUtf8Bytes(name), mpv_format.MPV_FORMAT_FLAG, ref val); mpv_error err = mpv_set_property(Handle, GetUtf8Bytes(name), mpv_format.MPV_FORMAT_FLAG, ref val);
if (err < 0) if (err < 0)

11
src/WinForms/MainForm.cs
View File

@@ -25,7 +25,6 @@ namespace mpvnet
int LastCursorChanged; int LastCursorChanged;
int LastCycleFullscreen; int LastCycleFullscreen;
int LastAppCommand;
int TaskbarButtonCreatedMessage; int TaskbarButtonCreatedMessage;
int ShownTickCount; int ShownTickCount;
@@ -698,13 +697,8 @@ namespace mpvnet
case 0x20e: // WM_MOUSEHWHEEL case 0x20e: // WM_MOUSEHWHEEL
case 0x20b: // WM_XBUTTONDOWN case 0x20b: // WM_XBUTTONDOWN
case 0x20c: // WM_XBUTTONUP case 0x20c: // WM_XBUTTONUP
{ if (Core.WindowHandle != IntPtr.Zero)
bool skip = m.Msg == 0x100 && LastAppCommand != 0 &&
(Environment.TickCount - LastAppCommand) < 1000;
if (Core.WindowHandle != IntPtr.Zero && !skip)
m.Result = SendMessage(Core.WindowHandle, m.Msg, m.WParam, m.LParam); m.Result = SendMessage(Core.WindowHandle, m.Msg, m.WParam, m.LParam);
}
break; break;
case 0x319: // WM_APPCOMMAND case 0x319: // WM_APPCOMMAND
{ {
@@ -712,9 +706,8 @@ namespace mpvnet
if (value != null) if (value != null)
{ {
Core.command("keypress " + value); Core.Command("keypress " + value);
m.Result = new IntPtr(1); m.Result = new IntPtr(1);
LastAppCommand = Environment.TickCount;
return; return;
} }
} }