Merge pull request #761 from MikeTheWatchGuy/Dev-latest

Fix for combobox number of visible items.
This commit is contained in:
MikeTheWatchGuy 2018-11-21 12:33:10 -05:00 committed by GitHub
commit 130638ce10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 10 deletions

View File

@ -3987,10 +3987,10 @@ def PackFormIntoFrame(window, containing_frame, toplevel_win):
if element_size[1] is not None: if element_size[1] is not None:
element.QT_ComboBox.setFixedHeight(element_size[1]) element.QT_ComboBox.setFixedHeight(element_size[1])
element.QT_ComboBox.addItems(element.Values) element.QT_ComboBox.addItems(element.Values)
element.QT_ComboBox.setMaxVisibleItems(element.VisibleItems) element.QT_ComboBox.setVisible(element.VisibleItems)
element.QT_ComboBox.setContentsMargins(*full_element_pad) element.QT_ComboBox.setSizeAdjustPolicy(QtWidgets.QComboBox.AdjustToContents)
# element.QT_ComboBox.setContentsMargins(*full_element_pad)
if element.ChangeSubmits: if element.ChangeSubmits:
element.QT_ComboBox.currentIndexChanged.connect(element.QtCurrentItemChanged) element.QT_ComboBox.currentIndexChanged.connect(element.QtCurrentItemChanged)
qt_row_layout.addWidget(element.QT_ComboBox) qt_row_layout.addWidget(element.QT_ComboBox)
@ -5744,6 +5744,7 @@ def PopupNonBlocking(*args, title=None, button_type=POPUP_BUTTONS_OK, button_col
""" """
Show Popup box and immediately return (does not block) Show Popup box and immediately return (does not block)
:param args: :param args:
:param title:
:param button_type: :param button_type:
:param button_color: :param button_color:
:param background_color: :param background_color:
@ -5777,6 +5778,7 @@ def PopupQuick(*args, title=None, button_type=POPUP_BUTTONS_OK, button_color=Non
""" """
Show Popup box that doesn't block and closes itself Show Popup box that doesn't block and closes itself
:param args: :param args:
:param title:
:param button_type: :param button_type:
:param button_color: :param button_color:
:param background_color: :param background_color:
@ -5809,6 +5811,7 @@ def PopupQuickMessage(*args, title=None, button_type=POPUP_BUTTONS_NO_BUTTONS, b
""" """
Show Popup box that doesn't block and closes itself Show Popup box that doesn't block and closes itself
:param args: :param args:
:param title:
:param button_type: :param button_type:
:param button_color: :param button_color:
:param background_color: :param background_color:
@ -5839,6 +5842,7 @@ def PopupNoTitlebar(*args, title=None, button_type=POPUP_BUTTONS_OK, button_colo
""" """
Display a Popup without a titlebar. Enables grab anywhere so you can move it Display a Popup without a titlebar. Enables grab anywhere so you can move it
:param args: :param args:
:param title:
:param button_type: :param button_type:
:param button_color: :param button_color:
:param background_color: :param background_color:
@ -5874,6 +5878,7 @@ def PopupAutoClose(*args, title=None, button_type=POPUP_BUTTONS_OK, button_color
""" """
Popup that closes itself after some time period Popup that closes itself after some time period
:param args: :param args:
:param title:
:param button_type: :param button_type:
:param button_color: :param button_color:
:param background_color: :param background_color:
@ -5907,6 +5912,7 @@ def PopupError(*args, title=None, button_color=DEFAULT_ERROR_BUTTON_COLOR, backg
""" """
Popup with colored button and 'Error' as button text Popup with colored button and 'Error' as button text
:param args: :param args:
:param title:
:param button_color: :param button_color:
:param background_color: :param background_color:
:param text_color: :param text_color:
@ -5935,6 +5941,7 @@ def PopupCancel(*args, title=None, button_color=None, background_color=None, tex
""" """
Display Popup with "cancelled" button text Display Popup with "cancelled" button text
:param args: :param args:
:param title:
:param button_color: :param button_color:
:param background_color: :param background_color:
:param text_color: :param text_color: