张洋 3 weeks ago
parent
commit
bc2e2c701b

BIN
bin/Win32/Debug/zhipuzi_pos_windows/DuiLib_d.dll


+ 2 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/aixuexi_page.xml

@@ -61,7 +61,8 @@
 					</TileLayout>
 					
 					<!-- 搜索行:对齐点单页(dc_search 九宫格 40 高满宽;inset / childvalign 照抄 diandan_page.xml) -->
-					<HorizontalLayout height="40" padding="0,0,0,0">
+					<!-- 搜索行右侧补 12:与左侧留白对称(父列右 inset 必须为 0,滚动条才能贴窗口右缘,故不改父列、只在本行 inset 右侧补) -->
+					<HorizontalLayout height="40" inset="0,0,12,0" padding="0,0,0,0">
 						<HorizontalLayout bkimage="file='dc_search.png' corner='20,20,20,20'" inset="16,0,12,0" childpadding="8" childvalign="vcenter">
 							<Control bkimage="dc_ico_search16.png" width="16" height="16" maxheight="16"/>
 							

+ 2 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/diandan_page.xml

@@ -176,7 +176,8 @@
 				<TileLayout name="diandan_foodlist" bkcolor="#00000000" vscrollbar="true" hscrollbar="false" childpadding="10">
 				</TileLayout>
 
-				<HorizontalLayout height="40" childpadding="10">
+				<!-- 搜索行右侧补 12:与左侧留白对称(父列右 inset 必须为 0,滚动条才能贴窗口右缘,故不改父列、只在本行 inset 右侧补) -->
+				<HorizontalLayout height="40" inset="0,0,12,0" childpadding="10">
 					<HorizontalLayout bkimage="file='dc_search.png' corner='20,20,20,20'" inset="16,0,12,0" childpadding="8" childvalign="vcenter">
 						<Control bkimage="dc_ico_search16.png" width="16" height="16" maxheight="16"/>
 						<Edit name="diandan_food_search_edit" tooltip="请输入商品名字或条码搜索" font="12" textcolor="#FF1F2329" maxheight="24" bkcolor="#00000000" nativebkcolor="#FFEFF1F3"/>

+ 4 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/shangpin_page.xml

@@ -52,7 +52,10 @@
 				<TileLayout name="shangpin_foodlist" bkcolor="#00000000" vscrollbar="true" hscrollbar="false" childpadding="10">
 				</TileLayout>
 
-				<HorizontalLayout height="40" childpadding="10">
+				<!-- inset 右 12:右列 shangpin_food_layout 的 inset 右必须为 0(滚动条贴窗口右缘),
+				     但搜索框是本列唯一会自动铺满的行,不补这 12 就会冲到最后一行右边,
+				     左边距 12 右边距 0 不对称。此 inset 只作用于本行,不影响上方两个滚动容器。 -->
+				<HorizontalLayout height="40" inset="0,0,12,0" childpadding="10">
 					<HorizontalLayout bkimage="file='dc_search.png' corner='20,20,20,20'" inset="16,0,12,0" childpadding="8" childvalign="vcenter">
 						<Control bkimage="dc_ico_search16.png" width="16" height="16" maxheight="16"/>
 						<Edit name="shangpin_food_search_edit" tooltip="请输入商品名字或条码搜索" font="12" textcolor="#FF1F2329" maxheight="24" bkcolor="#00000000" nativebkcolor="#FFEFF1F3"/>

+ 2 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/yubaozhuangbiaoqian_page.xml

@@ -42,7 +42,8 @@
 				<TileLayout name="yubaozhuangbiaoqian_foodlist" bkcolor="#00000000" vscrollbar="true" hscrollbar="false" childpadding="10">
 				</TileLayout>
 
-				<HorizontalLayout height="40" childpadding="10">
+				<!-- 搜索行右侧补 12:与左侧留白对称(父列右 inset 必须为 0,滚动条才能贴窗口右缘,故不改父列、只在本行 inset 右侧补) -->
+				<HorizontalLayout height="40" inset="0,0,12,0" childpadding="10">
 					<HorizontalLayout bkimage="file='dc_search.png' corner='20,20,20,20'" inset="16,0,12,0" childpadding="8" childvalign="vcenter">
 						<Control bkimage="dc_ico_search16.png" width="16" height="16" maxheight="16"/>
 						<Edit name="yubaozhuangbiaoqian_food_search_edit" tooltip="请输入商品名字或条码搜索" font="12" textcolor="#FF1F2329" maxheight="24" bkcolor="#00000000" nativebkcolor="#FFEFF1F3"/>

+ 2 - 1
bin/Win32/Debug/zhipuzi_pos_windows/skin/zhengcan_diandan_page.xml

@@ -210,7 +210,8 @@
 				<TileLayout name="diandan_foodlist" bkcolor="#00000000" vscrollbar="true" hscrollbar="false" childpadding="10">
 				</TileLayout>
 
-				<HorizontalLayout height="40" childpadding="10">
+				<!-- 搜索行右侧补 12:与左侧留白对称(父列右 inset 必须为 0,滚动条才能贴窗口右缘,故不改父列、只在本行 inset 右侧补) -->
+				<HorizontalLayout height="40" inset="0,0,12,0" childpadding="10">
 					<HorizontalLayout bkimage="file='dc_search.png' corner='20,20,20,20'" inset="16,0,12,0" childpadding="8" childvalign="vcenter">
 						<Control bkimage="dc_ico_search16.png" width="16" height="16" maxheight="16"/>
 						<Edit name="diandan_food_search_edit" tooltip="请输入商品名字或条码搜索" font="12" textcolor="#FF1F2329" maxheight="24" bkcolor="#00000000" nativebkcolor="#FFEFF1F3"/>

BIN
dll/debug/DuiLib_d.dll


BIN
lib/debug/DuiLib_d.lib


BIN
zhipuzi_pos_windows/resource/skin.zip