RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 02:07:35 +00:00
Code Issues Activity Actions

Spreadsheet: Call SheetModel::update() instead of invalidate()

Browse source 
SheetModel has its own custom updating method, and that must be called
in order to update the spreadsheet.
This commit is contained in:
sin-ack 2021-08-09 23:26:24 +00:00 • committed by Ali Mohammad Pur
parent 0a02496f04
commit 51d559e253
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Userland/Applications/Spreadsheet/SpreadsheetView.cpp
View file

@ -6,7 +6,6 @@
#include "SpreadsheetView.h" #include "SpreadsheetView.h"
#include "CellTypeDialog.h" #include "CellTypeDialog.h"
#include "SpreadsheetModel.h"
#include <AK/ScopeGuard.h> #include <AK/ScopeGuard.h>
#include <AK/URL.h> #include <AK/URL.h>
#include <LibCore/MimeData.h> #include <LibCore/MimeData.h>
@ -144,12 +143,13 @@ void InfinitelyScrollableTableView::mouseup_event(GUI::MouseEvent& event)
void SpreadsheetView::update_with_model() void SpreadsheetView::update_with_model()
{ {
m_table_view->model()->invalidate(); m_sheet_model->update();
m_table_view->update(); m_table_view->update();
} }
SpreadsheetView::SpreadsheetView(Sheet& sheet) SpreadsheetView::SpreadsheetView(Sheet& sheet)
: m_sheet(sheet) : m_sheet(sheet)
, m_sheet_model(SheetModel::create(*m_sheet))
{ {
set_layout<GUI::VerticalBoxLayout>().set_margins({ 2, 2, 2, 2 }); set_layout<GUI::VerticalBoxLayout>().set_margins({ 2, 2, 2, 2 });
m_table_view = add<InfinitelyScrollableTableView>(); m_table_view = add<InfinitelyScrollableTableView>();
@ -158,7 +158,7 @@ SpreadsheetView::SpreadsheetView(Sheet& sheet)
m_table_view->set_edit_triggers(GUI::AbstractView::EditTrigger::EditKeyPressed | GUI::AbstractView::AnyKeyPressed | GUI::AbstractView::DoubleClicked); m_table_view->set_edit_triggers(GUI::AbstractView::EditTrigger::EditKeyPressed | GUI::AbstractView::AnyKeyPressed | GUI::AbstractView::DoubleClicked);
m_table_view->set_tab_key_navigation_enabled(true); m_table_view->set_tab_key_navigation_enabled(true);
m_table_view->row_header().set_visible(true); m_table_view->row_header().set_visible(true);
m_table_view->set_model(SheetModel::create(*m_sheet)); m_table_view->set_model(m_sheet_model);
m_table_view->on_reaching_vertical_end = [&]() { m_table_view->on_reaching_vertical_end = [&]() {
for (size_t i = 0; i < 100; ++i) { for (size_t i = 0; i < 100; ++i) {
auto index = m_sheet->add_row(); auto index = m_sheet->add_row();

2
Userland/Applications/Spreadsheet/SpreadsheetView.h
View file

@ -7,6 +7,7 @@
#pragma once #pragma once
#include "Spreadsheet.h" #include "Spreadsheet.h"
#include "SpreadsheetModel.h"
#include <LibGUI/AbstractTableView.h> #include <LibGUI/AbstractTableView.h>
#include <LibGUI/ModelEditingDelegate.h> #include <LibGUI/ModelEditingDelegate.h>
#include <LibGUI/TableView.h> #include <LibGUI/TableView.h>
@ -155,6 +156,7 @@ private:
}; };
NonnullRefPtr<Sheet> m_sheet; NonnullRefPtr<Sheet> m_sheet;
NonnullRefPtr<SheetModel> m_sheet_model;
RefPtr<InfinitelyScrollableTableView> m_table_view; RefPtr<InfinitelyScrollableTableView> m_table_view;
RefPtr<GUI::Menu> m_cell_range_context_menu; RefPtr<GUI::Menu> m_cell_range_context_menu;
}; };