bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Geo Editor - Text sub-tool - fixed font size control not shown; fixes issue #470

Browse Source
This commit is contained in:
Marius Stanciu
2020-11-13 18:04:55 +02:00
parent 14c884b6ac
commit 6373f66e99
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -20,6 +20,7 @@ CHANGELOG for FlatCAM beta
- Milling Tool - finished the UI and also the button handlers in the Geometry and Excellon objects Properties UI - Milling Tool - finished the UI and also the button handlers in the Geometry and Excellon objects Properties UI
- Milling Tool - fixed the situation when launching the Tool but there is no object loaded - Milling Tool - fixed the situation when launching the Tool but there is no object loaded
- Milling Tool - made sure that on target object change the UI is build again - Milling Tool - made sure that on target object change the UI is build again
- Geo Editor - Text sub-tool - fixed font size control not shown; fixes issue #470
12.11.2020 12.11.2020

9
appEditors/AppGeoEditor.py
View File

@@ -286,7 +286,10 @@ class TextInputTool(AppTool):
# pass # pass
# Font size # Font size
self.font_size_cb = FCComboBox()
hlay = QtWidgets.QHBoxLayout()
self.font_size_cb = FCComboBox(policy=False)
self.font_size_cb.setEditable(True) self.font_size_cb.setEditable(True)
self.font_size_cb.setMinimumContentsLength(3) self.font_size_cb.setMinimumContentsLength(3)
self.font_size_cb.setMaximumWidth(70) self.font_size_cb.setMaximumWidth(70)
@@ -296,11 +299,9 @@ class TextInputTool(AppTool):
'32', '36', '40', '44', '48', '54', '60', '66', '32', '36', '40', '44', '48', '54', '60', '66',
'72', '80', '88', '96'] '72', '80', '88', '96']
for i in font_sizes: self.font_size_cb.addItems(font_sizes)
self.font_size_cb.addItem(i)
self.font_size_cb.setCurrentIndex(4) self.font_size_cb.setCurrentIndex(4)
hlay = QtWidgets.QHBoxLayout()
hlay.addWidget(self.font_size_cb) hlay.addWidget(self.font_size_cb)
hlay.addStretch() hlay.addStretch()