diff --git a/README.md b/README.md index a73e343..215fa45 100644 --- a/README.md +++ b/README.md @@ -848,6 +848,8 @@ means of the instance's `value` or `textvalue` methods. from gui.widgets.dropdown import Dropdown ``` +![Image](./images/dd_closed.JPG) ![Image](./images/dd_open.JPG) + A dropdown list. The list, when active, is drawn below the control. The height of the control is determined by the height of the font in use. The height of the list is determined by the number of entries in it and the font in use. @@ -953,6 +955,7 @@ in `gui/demos/screens.py`. ```python from gui.widgets.textbox import Textbox ``` +![Image](./images/textbox.JPG) Displays multiple lines of text in a field of fixed dimensions. Text may be clipped to the width of the control or may be word-wrapped. If the number of diff --git a/gui/widgets/dropdown.py b/gui/widgets/dropdown.py index 9cbf3ed..78cef2b 100644 --- a/gui/widgets/dropdown.py +++ b/gui/widgets/dropdown.py @@ -27,7 +27,7 @@ class _ListDialog(Window): super().__init__(row, col, ap_height, ap_width) self.listbox = Listbox(writer, row + 3, col + 3, elements = elements, width = lb_width, fgcolor = dd.fgcolor, bgcolor = dd.bgcolor, bdcolor=False, - fontcolor = WHITE, select_color = dd.select_color, + fontcolor = dd.fontcolor, select_color = dd.select_color, value = dd.value(), callback = self.callback) self.dropdown = dd diff --git a/gui/widgets/listbox.py b/gui/widgets/listbox.py index 07d5208..a23c5ff 100644 --- a/gui/widgets/listbox.py +++ b/gui/widgets/listbox.py @@ -60,9 +60,9 @@ class Listbox(Widget): for n in range(length): if n == self._value: display.fill_rect(x, y + 1, self.width, self.entry_height - 1, self.select_color) - display.print_left(self.writer, x + 2, y + 1, self.elements[n], self.fgcolor, self.select_color) + display.print_left(self.writer, x + 2, y + 1, self.elements[n], self.fontcolor, self.select_color) else: - display.print_left(self.writer, x + 2, y + 1, self.elements[n], self.fgcolor, self.bgcolor) + display.print_left(self.writer, x + 2, y + 1, self.elements[n], self.fontcolor, self.bgcolor) y += self.entry_height def textvalue(self, text=None): # if no arg return current text diff --git a/images/dd_closed.JPG b/images/dd_closed.JPG new file mode 100644 index 0000000..7b85b1c Binary files /dev/null and b/images/dd_closed.JPG differ diff --git a/images/dd_open.JPG b/images/dd_open.JPG new file mode 100644 index 0000000..f95f665 Binary files /dev/null and b/images/dd_open.JPG differ diff --git a/images/textbox.JPG b/images/textbox.JPG new file mode 100644 index 0000000..24e868e Binary files /dev/null and b/images/textbox.JPG differ