zhangyang 4 éve
szülő
commit
91478016bf

+ 4 - 4
bin/Win32/Debug/zhipuzi_pos_windows/skin/main.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Window size="1366,738" sizebox="4,4,6,6" caption="0,0,0,90" mininfo="1366,738" roundcorner="5,5" showdirty="false" >
+<Window size="1024,738" sizebox="4,4,6,6" caption="0,0,0,90" mininfo="1024,738" roundcorner="5,5" showdirty="false" >
 	<Font id="14" name="微软雅黑" size="14" />
 	<Font shared="true" id="16" name="微软雅黑" size="16" default="true" />
 	<Font id="18" name="微软雅黑" size="18" />
@@ -9,8 +9,8 @@
 	<Font id="26" name="微软雅黑" size="26" />
 	<Font id="28" name="微软雅黑" size="28" />	
 	
-	<Default shared="true" name="VScrollBar" showbutton1="false" showbutton2="false" width="8" value="width=&quot;8&quthumbnormalimage=&quot;file='scrollbar_shu_line_zhengchang.png' corner='2,2,2,2'&quot; thumbhotimage=&quot;file='scrollbar_shu_line_xuanfu.png' corner='2,2,2,2'&quot; thumbpushedimage=&quot;file='scrollbar_shu_line_dianji.png' corner='2,2,2,2'&quot;" />
-	<Default shared="true" name="HScrollBar" showbutton1="false" showbutton2="false" height="8" value="thumbnormalimage=&quot;file='scrollbar_heng_line_zhengchang.png' corner='2,2,2,2'&quot; thumbhotimage=&quot;file='scrollbar_heng_line_xuanfu.png' corner='2,2,2,2'&quot; thumbpushedimage=&quot;file='scrollbar_heng_line_dianji.png' corner='2,2,2,2'&quot;" />
+	<Default shared="true" name="VScrollBar" value="width=&quot;8&quot; showbutton1=&quot;false&quot; showbutton2=&quot;false&quot; thumbnormalimage=&quot;file='scrollbar_shu_line_zhengchang.png' corner='2,2,2,2'&quot; thumbhotimage=&quot;file='scrollbar_shu_line_xuanfu.png' corner='2,2,2,2'&quot; thumbpushedimage=&quot;file='scrollbar_shu_line_dianji.png' corner='2,2,2,2'&quot;" />
+    <Default shared="true" name="HScrollBar" value="height=&quot;8&quot; showbutton1=&quot;false&quot; showbutton2=&quot;false&quot; thumbnormalimage=&quot;file='scrollbar_heng_line_zhengchang.png' corner='2,2,2,2'&quot; thumbhotimage=&quot;file='scrollbar_heng_line_xuanfu.png' corner='2,2,2,2'&quot; thumbpushedimage=&quot;file='scrollbar_heng_line_dianji.png' corner='2,2,2,2'&quot;" />
 	
 	<Default name="Button" value="normalimage=&quot;file='green_zhengchang.png' corner='5,5,5,5'&quot; hotimage=&quot;file='green_xuanfu.png' corner='5,5,5,5'&quot; pushedimage=&quot;file='green_dianji.png' corner='5,5,5,5'&quot; " />	
 
@@ -18,7 +18,7 @@
 		<HorizontalLayout height="79" bkcolor="#FF3CB371">
 			<Control bkimage="main_logo.png" width="179" height="46" padding="15,17,0,17"></Control>
 			<Control width="1" padding="20,27,15,20" bkcolor="#FFFFFFFF"></Control>
-			<Label name="main_shopname" text="" width="600" padding="15,0,0,0" textcolor="#FFFFFFFF" font="28"/>
+			<Label name="main_shopname" text="" width="400" padding="15,0,0,0" textcolor="#FFFFFFFF" font="28"/>
 			<Control></Control>
 			<HorizontalLayout width="300" height="36" padding="0,21,20,0">
 				<Control></Control>

+ 4 - 0
zhipuzi_pos_windows/page/CDiandanPageUI.cpp

@@ -545,6 +545,10 @@ void CDiandanPageUI::UpdateJiesuanZhifuPos()
 
 	//根据宽度计算每行显示的数量
 	int nMeihangNum = (nWidth - 521 - 421) / 144;
+	if (nMeihangNum < 1)
+	{
+		nMeihangNum = 1;
+	}
 
 	int num = 0;