diff --git a/ofscraper/classes/table/compose.py b/ofscraper/classes/table/compose.py index 137f3aaa..ddf13fba 100644 --- a/ofscraper/classes/table/compose.py +++ b/ofscraper/classes/table/compose.py @@ -1,4 +1,4 @@ -from textual.containers import Container, Horizontal, Vertical,HorizontalGroup,VerticalGroup +from textual.containers import Container, Horizontal, Vertical,VerticalScroll,VerticalGroup,HorizontalGroup from textual.widgets import Button, ContentSwitcher, Rule,Static from ofscraper.classes.table.fields.datefield import DateField @@ -17,12 +17,12 @@ def composer(): - with Horizontal(id="buttons"): + with HorizontalGroup(id="buttons"): yield Button("DataTable", id="table") yield Button("Console", id="console") with ContentSwitcher(initial="table_page"): - with VerticalGroup(id="table_page"): + with VerticalScroll(id="table_page"): with Container(id="table_header"): with Horizontal(): with Vertical(classes="table_info"): @@ -38,10 +38,10 @@ def composer(): yield Static("",classes="search_info",shrink=True,markup=True) yield Rule() with HorizontalGroup(id="data"): - yield Button("Reset", id="reset") - yield Button( - ">> Send Downloads to OF-Scraper", id="send_downloads" - ) + yield Button("Reset", id="reset") + yield Button( + ">> Send Downloads to OF-Scraper", id="send_downloads" + ) with VerticalGroup(id="table_main"): yield DataTable(id="data_table") yield DataTable(id="data_table_hidden") diff --git a/ofscraper/classes/table/css.py b/ofscraper/classes/table/css.py index 4a882f92..16e86f24 100644 --- a/ofscraper/classes/table/css.py +++ b/ofscraper/classes/table/css.py @@ -9,8 +9,8 @@ } Screen { layers: sidebar; - overflow-y:scroll; - overflow-x:scroll; + overflow-y:hidden; + overflow-x:hidden; } Button{ @@ -20,10 +20,9 @@ Table=""" #data_table{ - margin-bottom:5; - margin-top:2; - height:70%; - min-height:40; + margin-bottom:4; + margin-top:1; + min-height:120; } #data_table_hidden { @@ -32,7 +31,6 @@ #table_main{ height:70%; - min-height:50; } #table_header{ height:30%;