diff --git a/desktop/gold_order_app.py b/desktop/gold_order_app.py index 0ee08c7..6d85954 100644 --- a/desktop/gold_order_app.py +++ b/desktop/gold_order_app.py @@ -52,6 +52,8 @@ LOT_MID = 0.05 LOT_LOW = 0.01 MAX_SIDE_LOTS = 0.50 MAX_OPEN_POSITIONS = 5 # 同时最多持仓笔数,满则买卖置灰 +POS_ROW_HEIGHT = 46 # 持仓列表单行约高(含内边距) +POS_LIST_HEIGHT = POS_ROW_HEIGHT * MAX_OPEN_POSITIONS # 默认可视 5 条持仓高度 DAY_LOSS_LOCK = 0.05 # 当日合计亏损达余额 5% 禁止开仓 DAY_PROFIT_LOCK = 0.10 # 当日合计盈利达余额 10% 禁止开仓 # 币圈习惯:绿涨红跌 @@ -939,8 +941,14 @@ class OrderApp(tk.Tk): ("浮盈", 9), ("操作", 10), ] - pos_wrap = tk.Frame(root, bg="#2b2b2b", highlightthickness=0) - pos_wrap.pack(fill=tk.BOTH, expand=True) + # 持仓区固定为 5 行可视高度,超出可滚动 + pos_wrap = tk.Frame( + root, + bg="#2b2b2b", + highlightthickness=1, + highlightbackground="#2a2a38", + ) + pos_wrap.pack(fill=tk.X, expand=False, pady=(0, 0)) self.pos_head = tk.Frame(pos_wrap, bg="#333333") self.pos_head.pack(fill=tk.X) @@ -955,9 +963,12 @@ class OrderApp(tk.Tk): anchor="center", ).grid(row=0, column=i, sticky="nsew", padx=2, pady=6) - body = tk.Frame(pos_wrap, bg="#2b2b2b") - body.pack(fill=tk.BOTH, expand=True) - self.pos_canvas = tk.Canvas(body, bg="#2b2b2b", highlightthickness=0, bd=0) + body = tk.Frame(pos_wrap, bg="#2b2b2b", height=POS_LIST_HEIGHT) + body.pack(fill=tk.X, expand=False) + body.pack_propagate(False) + self.pos_canvas = tk.Canvas( + body, bg="#2b2b2b", highlightthickness=0, bd=0, height=POS_LIST_HEIGHT + ) scroll = ttk.Scrollbar(body, orient=tk.VERTICAL, command=self.pos_canvas.yview) self.pos_inner = tk.Frame(self.pos_canvas, bg="#2b2b2b") self.pos_inner.bind( @@ -965,7 +976,7 @@ class OrderApp(tk.Tk): lambda e: self.pos_canvas.configure(scrollregion=self.pos_canvas.bbox("all")), ) self._pos_window = self.pos_canvas.create_window((0, 0), window=self.pos_inner, anchor="nw") - self.pos_canvas.configure(yscrollcommand=scroll.set) + self.pos_canvas.configure(yscrollcommand=scroll.set, height=POS_LIST_HEIGHT) self.pos_canvas.pack(side=tk.LEFT, fill=tk.BOTH, expand=True) scroll.pack(side=tk.RIGHT, fill=tk.Y) self.pos_canvas.bind("", self._on_pos_canvas_configure) diff --git a/releases/黄金市价辅助.exe b/releases/黄金市价辅助.exe index 932aa99..e39ae3d 100644 Binary files a/releases/黄金市价辅助.exe and b/releases/黄金市价辅助.exe differ