Browse Source

主窗口取消置顶

tags/对接微服务前
张剑 3 years ago
parent
commit
21cb1c205b

+ 2
- 2
XHWK.WKTool/App.config View File

9
     <!--参数是否加密 0不加密 1加密-->
9
     <!--参数是否加密 0不加密 1加密-->
10
     <add key="IsParameterEncryption" value="0" />
10
     <add key="IsParameterEncryption" value="0" />
11
     <!--版本号-->
11
     <!--版本号-->
12
-    <add key="VersionCode" value="98" />
13
-    <add key="VersionName" value="3.1.4" />
12
+    <add key="VersionCode" value="99" />
13
+    <add key="VersionName" value="3.1.5" />
14
     <!--皮肤样式 0白 1蓝 2黑色 -->
14
     <!--皮肤样式 0白 1蓝 2黑色 -->
15
     <add key="SkinStyle" value="0" />
15
     <add key="SkinStyle" value="0" />
16
     <!--是否输出视频记录日志:0否-->
16
     <!--是否输出视频记录日志:0否-->

+ 2
- 8
XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs View File

1259
 
1259
 
1260
         public void WindowType()
1260
         public void WindowType()
1261
         {
1261
         {
1262
-            if (WindowState == WindowState.Minimized)//截图完恢复窗口
1263
-            {
1264
-                Topmost = true;
1265
-                WindowState = WindowState.Normal;
1266
-            }
1262
+            this.Activate();
1267
         }
1263
         }
1268
 
1264
 
1269
         /// <summary>
1265
         /// <summary>
1277
             {
1273
             {
1278
                 if (WindowState == WindowState.Minimized)//截图完恢复窗口
1274
                 if (WindowState == WindowState.Minimized)//截图完恢复窗口
1279
                 {
1275
                 {
1280
-                    Topmost = true;
1281
                     WindowState = WindowState.Normal;
1276
                     WindowState = WindowState.Normal;
1277
+                    Activate();
1282
                 }
1278
                 }
1283
                 InitializeKeyDownEvent();
1279
                 InitializeKeyDownEvent();
1284
                 if (!string.IsNullOrWhiteSpace(APP.ImgPath) && File.Exists(APP.ImgPath))
1280
                 if (!string.IsNullOrWhiteSpace(APP.ImgPath) && File.Exists(APP.ImgPath))
1344
                         BtnPrint.IsEnabled = true;
1340
                         BtnPrint.IsEnabled = true;
1345
                     }
1341
                     }
1346
                 }
1342
                 }
1347
-                Topmost = false;
1348
             }
1343
             }
1349
             else if ("取消".Equals(text))
1344
             else if ("取消".Equals(text))
1350
             {
1345
             {
1351
                 if (WindowState == WindowState.Minimized)//截图完恢复窗口
1346
                 if (WindowState == WindowState.Minimized)//截图完恢复窗口
1352
                 {
1347
                 {
1353
-                    Topmost = true;
1354
                     WindowState = WindowState.Normal;
1348
                     WindowState = WindowState.Normal;
1355
                 }
1349
                 }
1356
             }
1350
             }

+ 1
- 1
星火微课/星火微课-正式.iss View File

3
 
3
 
4
 #define MyAppName "星火微课"  
4
 #define MyAppName "星火微课"  
5
 #define MyAppDir "xhwk"
5
 #define MyAppDir "xhwk"
6
-#define MyAppVersion "3.1.4"
6
+#define MyAppVersion "3.1.5"
7
 #define MyAppPublisher "河南星火燎原软件科技有限公司"
7
 #define MyAppPublisher "河南星火燎原软件科技有限公司"
8
 #define MyAppURL "http://www.xhkjedu.com/"
8
 #define MyAppURL "http://www.xhkjedu.com/"
9
 #define MySourcePath "D:\Project\CSharp\xhwkclient\XHWK.WKTool\bin\x86\Debug\"
9
 #define MySourcePath "D:\Project\CSharp\xhwkclient\XHWK.WKTool\bin\x86\Debug\"

Loading…
Cancel
Save