diff --git a/examples/basic.css b/examples/basic.css index f13f99b98..d3dae65cb 100644 --- a/examples/basic.css +++ b/examples/basic.css @@ -1,36 +1,34 @@ +/* CSS file for basic.py */ + App > View { - layout: dock; docks: side=left/1; } #sidebar { - text: bold #09312e on #3caea3; + text: #09312e on #3caea3; dock: side; width: 30; - height: 1fr; - border-right: outer #09312e; offset-x: -100%; - transition: offset 400ms in_out_cubic; + transition: offset 500ms in_out_cubic; + border-right: outer #09312e; } #sidebar.-active { offset-x: 0; - transition: offset 400ms in_out_cubic; } #header { - text: on #173f5f; - + text: white on #173f5f; height: 3; - border: hkey white; -} - -#footer { - height: 3; - border-top: hkey #0f2b41; - text: #3a3009 on #f6d55c; + border: hkey; } #content { - text: bold on #20639b; + text: white on #20639b; + border-bottom: hkey #0f2b41; +} + +#footer { + text: #3a3009 on #f6d55c; + height: 3; } diff --git a/examples/example.css b/examples/example.css index 9f5dc0507..2ccd53034 100644 --- a/examples/example.css +++ b/examples/example.css @@ -1,13 +1,28 @@ App > View { layout: dock; - docks: side=left/1 header=top footer=bottom; + docks: side=left/1; +} + +#header { + text: on #173f5f; + height: 3; + border: hkey white; +} + +#content { + text: on #20639b; +} + +#footer { + height: 3; + border-top: hkey #0f2b41; + text: #3a3009 on #f6d55c; } #sidebar { - text: bold #09312e on #3caea3; + text: #09312e on #3caea3; dock: side; width: 30; - height: 1fr; border-right: outer #09312e; offset-x: -100%; transition: offset 400ms in_out_cubic; @@ -17,22 +32,3 @@ App > View { offset-x: 0; transition: offset 400ms in_out_cubic; } - -#header { - text: on #173f5f; - dock: header; - height: 3; - border: hkey white; -} - -#footer { - dock: header; - height: 3; - border-top: hkey #0f2b41; - text: #3a3009 on #f6d55c; -} - -#content { - dock: header; - text: bold on #20639b; -} diff --git a/src/textual/_linux_driver.py b/src/textual/_linux_driver.py index 7b846a9df..393629888 100644 --- a/src/textual/_linux_driver.py +++ b/src/textual/_linux_driver.py @@ -52,7 +52,7 @@ class LinuxDriver(Driver): write("\x1b[?1015h") # SET_VT200_HIGHLIGHT_MOUSE write("\x1b[?1006h") # SET_SGR_EXT_MODE_MOUSE - write("\x1b[?1007h") + # write("\x1b[?1007h") self.console.file.flush() # Note: E.g. lxterminal understands 1000h, but not the urxvt or sgr @@ -110,7 +110,7 @@ class LinuxDriver(Driver): self.console.show_cursor(False) self.console.file.write("\033[?1003h\n") - + self.console.file.flush() self._key_thread = Thread( target=self.run_input_thread, args=(asyncio.get_event_loop(),) ) @@ -165,6 +165,7 @@ class LinuxDriver(Driver): self.console.set_alt_screen(False) self.console.show_cursor(True) + self.console.file.flush() def run_input_thread(self, loop) -> None: try: