张洋 3 лет назад
Родитель
Сommit
e8b70f0691

+ 2 - 2
bin/Win32/Debug/zhipuzi_pos_windows/skin/fuping_wnd.xml

@@ -49,8 +49,8 @@
 		
 		<HorizontalLayout name="shoukuan_title_bkg" height="36" bkcolor="0xFF3CB371">
 			<Control></Control>
-			<Control bkimage="logo_small.png" width="38" height="23" padding="0,6,15,6"></Control>
-			<Label text="智铺子收银系统 www.zhipuzi.com" width="280" textcolor="#FFFFFFFF"></Label>
+			<Control bkimage="logo_small.png" width="38" height="23" padding="0,6,5,6"></Control>
+			<Label text="智铺子收银系统  www.zhipuzi.com" width="280" textcolor="#FFFFFFFF"></Label>
 			<Control></Control>
 		</HorizontalLayout>	
 	</VerticalLayout>

+ 4 - 0
zhipuzi_pos_windows/tool/CShuangpingTool.cpp

@@ -52,9 +52,13 @@ void CShuangpingTool::Init()
 			continue;
 		}
 
+		EnumDisplaySettings(dd.DeviceName, 0, &devMode);
+
 		bFlag = EnumDisplaySettings(dd.DeviceName, ENUM_CURRENT_SETTINGS, &devMode);
 		if (bFlag == FALSE)
 		{
+			DWORD a = GetLastError();
+
 			continue;
 		}
 

+ 2 - 2
zhipuzi_pos_windows/zhipuzi_pos_windows.vcxproj

@@ -154,7 +154,7 @@ copy $(SolutionDir)res\icon\ $(SolutionDir)bin\$(Platform)\$(Configuration)\$(Pr
 </Command>
     </PostBuildEvent>
     <Manifest>
-      <EnableDpiAwareness>true</EnableDpiAwareness>
+      <EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
     </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -194,7 +194,7 @@ copy $(SolutionDir)res\icon\ $(SolutionDir)bin\$(Platform)\$(Configuration)\$(Pr
 </Command>
     </PostBuildEvent>
     <Manifest>
-      <EnableDpiAwareness>true</EnableDpiAwareness>
+      <EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
     </Manifest>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">