Skip to content

Commit c6b667b

Browse files
committed
fix: 兼容高清屏
1 parent 6032621 commit c6b667b

5 files changed

Lines changed: 28 additions & 26 deletions

File tree

src/gameScoreBoard.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
from PyQt5.QtWidgets import QTableWidgetItem
88
from PyQt5 import QtCore, QtGui
99
from PyQt5.QtWidgets import QShortcut
10-
from PyQt5.QtCore import Qt
1110

1211
class ui_Form(Ui_Form):
1312
# barSetMineNum = QtCore.pyqtSignal(int)
@@ -20,8 +19,8 @@ def __init__(self, r_path, pix_size):
2019
self.setupUi(self.QWidget)
2120

2221
self.tableWidget.setColumnWidth(0, 80)
23-
self.tableWidget.setColumnWidth(1, 120)
24-
self.tableWidget.verticalHeader().setDefaultSectionSize(24)
22+
self.tableWidget.setColumnWidth(1, 150)
23+
# self.tableWidget.verticalHeader().setDefaultSectionSize(24)
2524

2625
self.QWidget.setWindowIcon (QtGui.QIcon (str(r_path.with_name('media').joinpath('cat.ico'))))
2726

@@ -37,13 +36,11 @@ def reshow(self, index_name_list: list[str], index_value_list: list[str]):
3736
# 更新数值、指标。指标数量可能变
3837
table_height = len(index_name_list)*24
3938
self.tableWidget.setRowCount(len(index_name_list))
40-
self.tableWidget.setMinimumWidth(202)
41-
self.tableWidget.setMaximumWidth(202)
39+
# self.tableWidget.setMinimumWidth(232)
40+
# self.tableWidget.setMaximumWidth(232)
4241
self.tableWidget.setMaximumHeight(table_height + len(index_name_list) + 2)
4342
self.tableWidget.setMinimumHeight(table_height + len(index_name_list) + 2)
4443

45-
# self.QWidget.setMinimumSize(QtCore.QSize(224+2, table_height + 88))
46-
# self.QWidget.setMaximumSize(QtCore.QSize(224+2, table_height + 88))
4744
for idx, i in enumerate(index_name_list):
4845
self.tableWidget.setItem(idx, 0, QTableWidgetItem(i))
4946
self.show(index_value_list)

src/main.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ def find_window(class_name, window_name):
2020

2121

2222
if __name__ == "__main__":
23-
24-
23+
QtWidgets.QApplication.setAttribute(QtCore.Qt.AA_EnableHighDpiScaling)
2524

2625
app = QtWidgets.QApplication (sys.argv)
2726
mainWindow = mainWindowGUI.MainWindow()

src/minesweeper_master.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ def enumerateChangeBoard(board, game_board, poses: List[Tuple[int, int]]) -> (Li
267267

268268

269269
def trans_expression(expression: str):
270-
expression = expression.lower().strip()
270+
expression = expression.lower().strip()[:10000]
271271
expression = expression.replace("3bv", "bbbv")
272272
expression = expression.replace("opening", "op")
273273
expression = expression.replace("click", "cl")

src/ui/ui_score_board.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
class Ui_Form(object):
1515
def setupUi(self, Form):
1616
Form.setObjectName("Form")
17-
Form.resize(234, 492)
18-
Form.setMinimumSize(QtCore.QSize(234, 30))
19-
Form.setMaximumSize(QtCore.QSize(239, 1000))
17+
Form.resize(264, 492)
18+
Form.setMinimumSize(QtCore.QSize(264, 30))
19+
Form.setMaximumSize(QtCore.QSize(264, 1000))
2020
Form.setSizeIncrement(QtCore.QSize(0, 0))
2121
icon = QtGui.QIcon()
2222
icon.addPixmap(QtGui.QPixmap("media/cat.ico"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
@@ -47,7 +47,9 @@ def setupUi(self, Form):
4747
sizePolicy.setHeightForWidth(self.tableWidget.sizePolicy().hasHeightForWidth())
4848
self.tableWidget.setSizePolicy(sizePolicy)
4949
self.tableWidget.setMinimumSize(QtCore.QSize(202, 0))
50-
self.tableWidget.setMaximumSize(QtCore.QSize(203, 16777215))
50+
self.tableWidget.setMaximumSize(QtCore.QSize(232, 16777215))
51+
self.tableWidget.setSizeIncrement(QtCore.QSize(232, 0))
52+
self.tableWidget.setBaseSize(QtCore.QSize(232, 0))
5153
self.tableWidget.setToolTip("")
5254
self.tableWidget.setStatusTip("")
5355
self.tableWidget.setWhatsThis("")
@@ -91,9 +93,7 @@ def setupUi(self, Form):
9193
self.tableWidget.setHorizontalHeaderItem(1, item)
9294
self.tableWidget.horizontalHeader().setVisible(False)
9395
self.tableWidget.horizontalHeader().setCascadingSectionResizes(False)
94-
self.tableWidget.horizontalHeader().setDefaultSectionSize(87)
9596
self.tableWidget.horizontalHeader().setHighlightSections(False)
96-
self.tableWidget.horizontalHeader().setMinimumSectionSize(28)
9797
self.tableWidget.verticalHeader().setVisible(False)
9898
self.tableWidget.verticalHeader().setHighlightSections(False)
9999
self.verticalLayout.addWidget(self.tableWidget, 0, QtCore.Qt.AlignHCenter)

uiFiles/ui_score_board.ui

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>234</width>
9+
<width>264</width>
1010
<height>492</height>
1111
</rect>
1212
</property>
1313
<property name="minimumSize">
1414
<size>
15-
<width>234</width>
15+
<width>264</width>
1616
<height>30</height>
1717
</size>
1818
</property>
1919
<property name="maximumSize">
2020
<size>
21-
<width>239</width>
21+
<width>264</width>
2222
<height>1000</height>
2323
</size>
2424
</property>
@@ -110,10 +110,22 @@
110110
</property>
111111
<property name="maximumSize">
112112
<size>
113-
<width>203</width>
113+
<width>232</width>
114114
<height>16777215</height>
115115
</size>
116116
</property>
117+
<property name="sizeIncrement">
118+
<size>
119+
<width>232</width>
120+
<height>0</height>
121+
</size>
122+
</property>
123+
<property name="baseSize">
124+
<size>
125+
<width>232</width>
126+
<height>0</height>
127+
</size>
128+
</property>
117129
<property name="toolTip">
118130
<string notr="true"/>
119131
</property>
@@ -186,12 +198,6 @@
186198
<attribute name="horizontalHeaderCascadingSectionResizes">
187199
<bool>false</bool>
188200
</attribute>
189-
<attribute name="horizontalHeaderMinimumSectionSize">
190-
<number>28</number>
191-
</attribute>
192-
<attribute name="horizontalHeaderDefaultSectionSize">
193-
<number>87</number>
194-
</attribute>
195201
<attribute name="horizontalHeaderHighlightSections">
196202
<bool>false</bool>
197203
</attribute>

0 commit comments

Comments
 (0)