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

Command palette shows commands without assigned menu item

Browse Source
This commit is contained in:
Frank Skare
2021-03-10 16:40:31 +01:00
parent 62789fa036
commit d0ad69656a
6 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Changelog.md
View File

@@ -2,8 +2,9 @@
5.4.8.8 Beta (2021-03-??) 5.4.8.8 Beta (2021-03-??)
========================= =========================
- The mpv window-scale property works now exactly like in mpv. - Improved window scaling.
- Implementation for the mpv title property. - Title property implementation.
- Command palette shows commands without assigned menu item.
5.4.8.7 Beta (2021-03-09) 5.4.8.7 Beta (2021-03-09)

1
mpv.net/Misc/Misc.cs
View File

@@ -102,6 +102,7 @@ namespace mpvnet
public string Path { get; set; } = ""; public string Path { get; set; } = "";
public string Command { get; set; } = ""; public string Command { get; set; } = "";
public string Display { get { return string.IsNullOrEmpty(Path) ? Command : Path; } }
public CommandItem() { } public CommandItem() { }

5
mpv.net/Resources/input.conf.txt
View File

@@ -141,8 +141,9 @@
Ctrl+t set ontop yes #menu: View > On Top > Enable Ctrl+t set ontop yes #menu: View > On Top > Enable
Ctrl+T set ontop no #menu: View > On Top > Disable Ctrl+T set ontop no #menu: View > On Top > Disable
Alt++ script-message mpv.net scale-window 1.2 #menu: View > Window Size > Enlarge Alt++ script-message mpv.net scale-window 1.2 #menu: View > Zoom > Enlarge
Alt+- script-message mpv.net scale-window 0.8 #menu: View > Window Size > Shrink Alt+- script-message mpv.net scale-window 0.8 #menu: View > Zoom > Shrink
_ ignore #menu: View > Zoom > -
Alt+0 set window-scale 0.5 #menu: View > Zoom > 50 % Alt+0 set window-scale 0.5 #menu: View > Zoom > 50 %
Alt+1 set window-scale 1.0 #menu: View > Zoom > 100 % Alt+1 set window-scale 1.0 #menu: View > Zoom > 100 %
Alt+2 set window-scale 2.0 #menu: View > Zoom > 200 % Alt+2 set window-scale 2.0 #menu: View > Zoom > 200 %

4
mpv.net/WPF/CommandPaletteWindow.xaml
View File

@@ -45,8 +45,8 @@
<ColumnDefinition /> <ColumnDefinition />
<ColumnDefinition /> <ColumnDefinition />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Text="{Binding Path}"></TextBlock> <TextBlock Text="{Binding Display}"></TextBlock>
<TextBlock Grid.Column="1" <TextBlock Grid.Column="1"
Text="{Binding Input}" Text="{Binding Input}"

2
mpv.net/WPF/CommandPaletteWindow.xaml.cs
View File

@@ -26,7 +26,7 @@ namespace mpvnet
bool Filter(CommandItem item) bool Filter(CommandItem item)
{ {
if (item.Command == "" || item.Path == "") if (item.Command == "")
return false; return false;
string filter = FilterTextBox.Text.ToLower(); string filter = FilterTextBox.Text.ToLower();

18
mpv.net/WinForms/MainForm.cs
View File

@@ -146,9 +146,12 @@ namespace mpvnet
} }
} }
void ScaleWindow(float value) void ScaleWindow(float value) {
{ BeginInvoke(new Action(() => {
BeginInvoke(new Action(() => SetFormPosAndSize(value))); if (value < 1 && (Width == MinimumSize.Width || Height == MinimumSize.Height))
return;
SetFormPosAndSize(value, false, false, false);
}));
} }
void WindowScale(double scale) void WindowScale(double scale)
@@ -334,7 +337,10 @@ namespace mpvnet
return null; return null;
} }
void SetFormPosAndSize(double scale = 1, bool force = false) void SetFormPosAndSize(double scale = 1,
bool force = false,
bool checkAutofitSmaller = true,
bool checkAutofitLarger = true)
{ {
if (!force) if (!force)
{ {
@@ -375,7 +381,8 @@ namespace mpvnet
} }
height = Convert.ToInt32(height * scale); height = Convert.ToInt32(height * scale);
SetSize(new Size(height * videoSize.Width / videoSize.Height, height), videoSize, screen); SetSize(new Size(height * videoSize.Width / videoSize.Height, height),
videoSize, screen, checkAutofitSmaller, checkAutofitLarger);
} }
void SetSize(Size size, void SetSize(Size size,
@@ -842,6 +849,7 @@ namespace mpvnet
WPF.WPF.Init(); WPF.WPF.Init();
System.Windows.Application.Current.ShutdownMode = System.Windows.ShutdownMode.OnExplicitShutdown; System.Windows.Application.Current.ShutdownMode = System.Windows.ShutdownMode.OnExplicitShutdown;
Cursor.Position = new Point(Cursor.Position.X + 1, Cursor.Position.Y); Cursor.Position = new Point(Cursor.Position.X + 1, Cursor.Position.Y);
MinimumSize = new Size(FontHeight * 9, FontHeight * 9);
UpdateCheck.DailyCheck(); UpdateCheck.DailyCheck();
core.LoadScripts(); core.LoadScripts();
Task.Run(() => App.Extension = new Extension()); Task.Run(() => App.Extension = new Extension());