diff --git a/ScreenRotateForWin10/MainWindow.xaml b/ScreenRotateForWin10/MainWindow.xaml
index b99035e..c7db681 100644
--- a/ScreenRotateForWin10/MainWindow.xaml
+++ b/ScreenRotateForWin10/MainWindow.xaml
@@ -5,7 +5,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:ScreenRotateForWin10"
mc:Ignorable="d"
- Title="屏幕转向控制程序" Height="410" Width="360" ResizeMode="CanMinimize">
+ Title="屏幕转向控制程序" Height="410" Width="360" ResizeMode="CanMinimize" LocationChanged="Window_LocationChanged">
@@ -14,7 +14,7 @@
-
+
@@ -30,7 +30,11 @@
-
+
+
+
+
+
diff --git a/ScreenRotateForWin10/MainWindow.xaml.cs b/ScreenRotateForWin10/MainWindow.xaml.cs
index a4902cb..2979b4e 100644
--- a/ScreenRotateForWin10/MainWindow.xaml.cs
+++ b/ScreenRotateForWin10/MainWindow.xaml.cs
@@ -1,7 +1,9 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
using System.Linq;
using System.Windows;
using System.Windows.Forms;
+using System.Windows.Interop;
namespace ScreenRotateForWin10
{
@@ -19,19 +21,29 @@ public MainWindow()
private List screenList = new List();
private int screenCount = 0;
+ private int currScreenID = 0;
+ private int primaryScreenID = 0;
+ private readonly List allScreens = Screen.AllScreens.ToList();
private void Init()
{
var result = new List();
- screenCount = Screen.AllScreens.Count();
+
+ screenCount = allScreens.Count;
result.AddRange(
Enumerable.Range(0, screenCount)
- .Select(x => $"{x + 1}号屏幕") // $"NO.{x} Screen"
+ .Select(x => $"{x + 1}号屏幕") // $"NO.{x + 1} Screen"
);
result.Add("所有"); // All
+
+ primaryScreenID = allScreens.IndexOf(Screen.PrimaryScreen) + 1;
+ primaryScreenLabel.Content = $"主屏幕:{primaryScreenID}号屏幕"; // "Primary Screen: NO.? Screen"
+
screenList = result;
choiceComboBox.ItemsSource = screenList;
choiceComboBox.SelectedIndex = result.Count - 1; // Last
+
+ Window_LocationChanged(null, null); // currScreen label changed
}
private void RotateChoice(int choice, Display.Orientations degree)
@@ -73,5 +85,12 @@ private void Button_Click_4(object sender, RoutedEventArgs e)
{
RotateChoice(choiceComboBox.SelectedIndex, Display.Orientations.DEGREES_CW_0);
}
+
+ private void Window_LocationChanged(object sender, EventArgs e)
+ {
+ var currScreen = Screen.FromHandle(new WindowInteropHelper(this).Handle);
+ currScreenID = allScreens.IndexOf(currScreen) + 1;
+ currScreenLabel.Content = $"当前:{currScreenID}号屏幕"; // "Curr: NO.? Screen"
+ }
}
}
diff --git a/ScreenRotateForWin10/ScreenRotateForWin10.csproj b/ScreenRotateForWin10/ScreenRotateForWin10.csproj
index 54240ed..e143768 100644
--- a/ScreenRotateForWin10/ScreenRotateForWin10.csproj
+++ b/ScreenRotateForWin10/ScreenRotateForWin10.csproj
@@ -14,6 +14,25 @@
4
true
true
+ false
+ publish\
+ false
+ Disk
+ false
+ Foreground
+ 7
+ Days
+ false
+ false
+ true
+ https://github.com/lsylusiyao/ScreenRotateForWin10
+ ScreenRotateForWin10
+ lsylusiyao
+ 0
+ 1.1.0.0
+ false
+ true
+ true
AnyCPU
@@ -40,6 +59,21 @@
program_icon.ico
+
+ CD11585E956AD426401BFC276EE44D4C1E733CD9
+
+
+ ScreenRotateForWin10_TemporaryKey.pfx
+
+
+ true
+
+
+ LocalIntranet
+
+
+ true
+
@@ -100,6 +134,7 @@
SettingsSingleFileGenerator
Settings.Designer.cs
+
@@ -107,5 +142,17 @@
+
+
+ False
+ Microsoft .NET Framework 4.6 %28x86 和 x64%29
+ true
+
+
+ False
+ .NET Framework 3.5 SP1
+ false
+
+
\ No newline at end of file
diff --git a/ScreenRotateForWin10/app.manifest b/ScreenRotateForWin10/app.manifest
index 9ea09f0..2e9b12e 100644
--- a/ScreenRotateForWin10/app.manifest
+++ b/ScreenRotateForWin10/app.manifest
@@ -1,6 +1,6 @@
-
+
@@ -17,33 +17,29 @@
-->
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file