From ccea1b2376df6778007342b010df49bc773e76d6 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Fri, 28 Aug 2020 17:08:57 +0200 Subject: [PATCH] Spreadsheet: Let GUI::TableView paint the grid and cursor :^) --- Applications/Spreadsheet/SpreadsheetView.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Applications/Spreadsheet/SpreadsheetView.cpp b/Applications/Spreadsheet/SpreadsheetView.cpp index 22d121d68f..0909df33e7 100644 --- a/Applications/Spreadsheet/SpreadsheetView.cpp +++ b/Applications/Spreadsheet/SpreadsheetView.cpp @@ -57,6 +57,8 @@ SpreadsheetView::SpreadsheetView(Sheet& sheet) { set_layout().set_margins({ 2, 2, 2, 2 }); m_table_view = add(); + m_table_view->set_grid_style(GUI::TableView::GridStyle::Both); + m_table_view->set_cursor_style(GUI::TableView::CursorStyle::Item); m_table_view->row_header().set_visible(true); m_table_view->set_model(SheetModel::create(*m_sheet)); @@ -125,16 +127,11 @@ void SpreadsheetView::TableCellPainter::paint(GUI::Painter& painter, const Gfx:: // Undo the horizontal padding done by the table view... auto cell_rect = rect.inflated(m_table_view.horizontal_padding() * 2, 0); - painter.draw_line(cell_rect.bottom_left(), cell_rect.bottom_right(), palette.ruler()); - painter.draw_line(cell_rect.top_right(), cell_rect.bottom_right(), palette.ruler()); - if (m_table_view.selection().contains(index)) { Color fill_color = palette.selection(); fill_color.set_alpha(80); painter.fill_rect(cell_rect, fill_color); } - if (m_table_view.cursor_index() == index) - painter.draw_rect(cell_rect, palette.text_cursor()); auto text_color = index.data(GUI::ModelRole::ForegroundColor).to_color(palette.color(m_table_view.foreground_role())); auto data = index.data();