From 19fa70c8211739949c95404d9a87230656a9227f Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Sat, 23 Mar 2019 03:53:51 +0100 Subject: [PATCH] LibGUI: Add a GItemView class. This is a GAbstractView subclass that implements a icon-based view onto a GModel. It still need a bunch of work, but it's in basic usable shape. --- Applications/FileManager/DirectoryModel.cpp | 4 + .../FileManager/DirectoryTableView.cpp | 72 +++++-- Applications/FileManager/DirectoryTableView.h | 19 +- Applications/FileManager/main.cpp | 35 ++- Base/res/icons/16x16/filetype-image.png | Bin 5417 -> 5464 bytes LibGUI/GAbstractView.cpp | 4 +- LibGUI/GAbstractView.h | 5 + LibGUI/GItemView.cpp | 199 ++++++++++++++++++ LibGUI/GItemView.h | 44 ++++ LibGUI/GModel.h | 2 +- LibGUI/GScrollableWidget.cpp | 15 +- LibGUI/GScrollableWidget.h | 2 + LibGUI/GStackWidget.cpp | 2 +- LibGUI/GTableView.cpp | 2 +- LibGUI/GTableView.h | 2 + LibGUI/Makefile | 1 + 16 files changed, 361 insertions(+), 47 deletions(-) create mode 100644 LibGUI/GItemView.cpp create mode 100644 LibGUI/GItemView.h diff --git a/Applications/FileManager/DirectoryModel.cpp b/Applications/FileManager/DirectoryModel.cpp index 77cd8dfec7..5dd863df28 100644 --- a/Applications/FileManager/DirectoryModel.cpp +++ b/Applications/FileManager/DirectoryModel.cpp @@ -165,11 +165,15 @@ GVariant DirectoryModel::data(const GModelIndex& index, Role role) const case Column::Inode: return (int)entry.inode; } } + if (role == Role::Icon) { + return icon_for(entry); + } return { }; } void DirectoryModel::update() { + dbgprintf("DirectoryModel::update\n"); DIR* dirp = opendir(m_path.characters()); if (!dirp) { perror("opendir"); diff --git a/Applications/FileManager/DirectoryTableView.cpp b/Applications/FileManager/DirectoryTableView.cpp index a445f22216..5149410ec4 100644 --- a/Applications/FileManager/DirectoryTableView.cpp +++ b/Applications/FileManager/DirectoryTableView.cpp @@ -1,49 +1,75 @@ #include "DirectoryTableView.h" #include -DirectoryTableView::DirectoryTableView(GWidget* parent) - : GTableView(parent) +DirectoryView::DirectoryView(GWidget* parent) + : GStackWidget(parent) , m_model(DirectoryModel::create()) { - set_model(GSortingProxyModel::create(m_model.copy_ref())); - GTableView::model()->set_key_column_and_sort_order(DirectoryModel::Column::Name, GSortOrder::Ascending); + set_active_widget(nullptr); + m_item_view = new GItemView(this); + m_item_view->set_model(model()); + + m_table_view = new GTableView(this); + m_table_view->set_model(GSortingProxyModel::create(m_model.copy_ref())); + + model().set_key_column_and_sort_order(DirectoryModel::Column::Name, GSortOrder::Ascending); + + m_item_view->set_model_column(DirectoryModel::Column::Name); + + m_table_view->on_model_notification = [this] (const GModelNotification& notification) { + if (notification.type() == GModelNotification::Type::ModelUpdated) { + set_status_message(String::format("%d item%s (%u byte%s)", + model().row_count(), + model().row_count() != 1 ? "s" : "", + model().bytes_in_files(), + model().bytes_in_files() != 1 ? "s" : "")); + + if (on_path_change) + on_path_change(model().path()); + } + }; + + set_view_mode(ViewMode::Icon); } -DirectoryTableView::~DirectoryTableView() +DirectoryView::~DirectoryView() { } -void DirectoryTableView::open(const String& path) +void DirectoryView::set_view_mode(ViewMode mode) +{ + if (m_view_mode == mode) + return; + m_view_mode = mode; + update(); + if (mode == ViewMode::List) { + set_active_widget(m_table_view); + return; + } + if (mode == ViewMode::Icon) { + set_active_widget(m_item_view); + return; + } + ASSERT_NOT_REACHED(); +} + +void DirectoryView::open(const String& path) { model().open(path); } -void DirectoryTableView::model_notification(const GModelNotification& notification) -{ - if (notification.type() == GModelNotification::Type::ModelUpdated) { - set_status_message(String::format("%d item%s (%u byte%s)", - model().row_count(), - model().row_count() != 1 ? "s" : "", - model().bytes_in_files(), - model().bytes_in_files() != 1 ? "s" : "")); - - if (on_path_change) - on_path_change(model().path()); - } -} - -void DirectoryTableView::set_status_message(const String& message) +void DirectoryView::set_status_message(const String& message) { if (on_status_message) on_status_message(message); } -void DirectoryTableView::open_parent_directory() +void DirectoryView::open_parent_directory() { model().open(String::format("%s/..", model().path().characters())); } -void DirectoryTableView::refresh() +void DirectoryView::refresh() { model().update(); } diff --git a/Applications/FileManager/DirectoryTableView.h b/Applications/FileManager/DirectoryTableView.h index 5725ff7d58..67b6ee5b17 100644 --- a/Applications/FileManager/DirectoryTableView.h +++ b/Applications/FileManager/DirectoryTableView.h @@ -1,13 +1,15 @@ #pragma once #include +#include +#include #include #include "DirectoryModel.h" -class DirectoryTableView final : public GTableView { +class DirectoryView final : public GStackWidget { public: - explicit DirectoryTableView(GWidget* parent); - virtual ~DirectoryTableView() override; + explicit DirectoryView(GWidget* parent); + virtual ~DirectoryView() override; void open(const String& path); String path() const { return model().path(); } @@ -18,13 +20,20 @@ public: Function on_path_change; Function on_status_message; -private: - virtual void model_notification(const GModelNotification&) override; + enum ViewMode { Invalid, List, Icon }; + void set_view_mode(ViewMode); + ViewMode view_mode() const { return m_view_mode; } +private: DirectoryModel& model() { return *m_model; } const DirectoryModel& model() const { return *m_model; } void set_status_message(const String&); + ViewMode m_view_mode { Invalid }; + Retained m_model; + + GTableView* m_table_view { nullptr }; + GItemView* m_item_view { nullptr }; }; diff --git a/Applications/FileManager/main.cpp b/Applications/FileManager/main.cpp index 6405d9df67..73ff945fad 100644 --- a/Applications/FileManager/main.cpp +++ b/Applications/FileManager/main.cpp @@ -47,22 +47,22 @@ int main(int argc, char** argv) auto* location_textbox = new GTextEditor(GTextEditor::SingleLine, location_toolbar); - auto* directory_table_view = new DirectoryTableView(widget); + auto* directory_view = new DirectoryView(widget); auto* statusbar = new GStatusBar(widget); - location_textbox->on_return_pressed = [directory_table_view] (auto& editor) { - directory_table_view->open(editor.text()); + location_textbox->on_return_pressed = [directory_view] (auto& editor) { + directory_view->open(editor.text()); }; - auto open_parent_directory_action = GAction::create("Open parent directory", { Mod_Alt, Key_Up }, GraphicsBitmap::load_from_file("/res/icons/parentdirectory16.png"), [directory_table_view] (const GAction&) { - directory_table_view->open_parent_directory(); + auto open_parent_directory_action = GAction::create("Open parent directory", { Mod_Alt, Key_Up }, GraphicsBitmap::load_from_file("/res/icons/parentdirectory16.png"), [directory_view] (const GAction&) { + directory_view->open_parent_directory(); }); auto mkdir_action = GAction::create("New directory...", GraphicsBitmap::load_from_file("/res/icons/16x16/mkdir.png"), [&] (const GAction&) { GInputBox input_box("Enter name:", "New directory", window); if (input_box.exec() == GInputBox::ExecOK && !input_box.text_value().is_empty()) { auto new_dir_path = String::format("%s/%s", - directory_table_view->path().characters(), + directory_view->path().characters(), input_box.text_value().characters() ); int rc = mkdir(new_dir_path.characters(), 0777); @@ -70,11 +70,19 @@ int main(int argc, char** argv) GMessageBox message_box(String::format("mkdir() failed: %s", strerror(errno)), "Error", window); message_box.exec(); } else { - directory_table_view->refresh(); + directory_view->refresh(); } } }); + auto view_as_list_action = GAction::create("List view", { Mod_Ctrl, KeyCode::Key_L }, [&] (const GAction&) { + directory_view->set_view_mode(DirectoryView::ViewMode::List); + }); + + auto view_as_icons_action = GAction::create("Icon view", { Mod_Ctrl, KeyCode::Key_I }, [&] (const GAction&) { + directory_view->set_view_mode(DirectoryView::ViewMode::Icon); + }); + auto copy_action = GAction::create("Copy", GraphicsBitmap::load_from_file("/res/icons/copyfile16.png"), [] (const GAction&) { dbgprintf("'Copy' action activated!\n"); }); @@ -99,6 +107,11 @@ int main(int argc, char** argv) file_menu->add_action(delete_action.copy_ref()); menubar->add_menu(move(file_menu)); + auto view_menu = make("View"); + view_menu->add_action(view_as_list_action.copy_ref()); + view_menu->add_action(view_as_icons_action.copy_ref()); + menubar->add_menu(move(view_menu)); + auto help_menu = make("Help"); help_menu->add_action(GAction::create("About", [] (const GAction&) { dbgprintf("FIXME: Implement Help/About\n"); @@ -112,17 +125,17 @@ int main(int argc, char** argv) main_toolbar->add_action(copy_action.copy_ref()); main_toolbar->add_action(delete_action.copy_ref()); - directory_table_view->on_path_change = [window, location_textbox] (const String& new_path) { + directory_view->on_path_change = [window, location_textbox] (const String& new_path) { window->set_title(String::format("FileManager: %s", new_path.characters())); location_textbox->set_text(new_path); }; - directory_table_view->on_status_message = [statusbar] (String message) { + directory_view->on_status_message = [statusbar] (String message) { statusbar->set_text(move(message)); }; - directory_table_view->open("/"); - directory_table_view->set_focus(true); + directory_view->open("/"); + directory_view->set_focus(true); window->set_main_widget(widget); window->show(); diff --git a/Base/res/icons/16x16/filetype-image.png b/Base/res/icons/16x16/filetype-image.png index a5a49f585557f1157e2f29d23abc242077de22a3..701155ddf92d1681f24bbd19db0f9bf48b94f1a3 100644 GIT binary patch delta 1580 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 model) did_update_model(); } -void GAbstractView::model_notification(const GModelNotification&) +void GAbstractView::model_notification(const GModelNotification& notification) { + if (on_model_notification) + on_model_notification(notification); } void GAbstractView::did_update_model() diff --git a/LibGUI/GAbstractView.h b/LibGUI/GAbstractView.h index 69a45aabad..99fa48e9cd 100644 --- a/LibGUI/GAbstractView.h +++ b/LibGUI/GAbstractView.h @@ -2,6 +2,7 @@ #include #include +#include class GAbstractView : public GScrollableWidget { friend class GModel; @@ -18,6 +19,10 @@ public: virtual bool accepts_focus() const override { return true; } virtual void did_update_model(); + Function on_model_notification; + + virtual const char* class_name() const override { return "GAbstractView"; } + protected: virtual void model_notification(const GModelNotification&); diff --git a/LibGUI/GItemView.cpp b/LibGUI/GItemView.cpp new file mode 100644 index 0000000000..4acab7073a --- /dev/null +++ b/LibGUI/GItemView.cpp @@ -0,0 +1,199 @@ +#include +#include +#include +#include +#include + +GItemView::GItemView(GWidget* parent) + : GAbstractView(parent) +{ +} + +GItemView::~GItemView() +{ +} + +void GItemView::scroll_into_view(const GModelIndex& index, Orientation orientation) +{ + GScrollableWidget::scroll_into_view(item_rect(index.row()), orientation); +} + +void GItemView::resize_event(GResizeEvent& event) +{ + GAbstractView::resize_event(event); + update_content_size(); +} + +void GItemView::did_update_model() +{ + GAbstractView::did_update_model(); + update_content_size(); + update(); +} + +void GItemView::update_content_size() +{ + if (!model()) + return set_content_size({ }); + + m_visual_column_count = available_size().width() / effective_item_size().width(); + if (m_visual_column_count) + m_visual_row_count = ceil_div(model()->row_count(), m_visual_column_count); + else + m_visual_row_count = 0; + + int content_width = available_size().width(); + int content_height = m_visual_row_count * effective_item_size().height(); + + set_content_size({ content_width, content_height }); +} + +Rect GItemView::item_rect(int item_index) const +{ + if (!m_visual_row_count || !m_visual_column_count) + return { }; + int visual_row_index = item_index / m_visual_column_count; + int visual_column_index = item_index % m_visual_column_count; + return { + visual_column_index * effective_item_size().width(), + visual_row_index * effective_item_size().height(), + effective_item_size().width(), + effective_item_size().height() + }; +} + +void GItemView::mousedown_event(GMouseEvent& event) +{ + if (event.button() == GMouseButton::Left) { + // FIXME: Since all items are the same size, just compute the clicked item index + // instead of iterating over everything. + auto adjusted_position = event.position().translated(0, vertical_scrollbar().value()); + for (int i = 0; i < item_count(); ++i) { + if (item_rect(i).contains(adjusted_position)) { + model()->set_selected_index({ i, 0 }); + update(); + return; + } + } + model()->set_selected_index({ }); + update(); + } +} + +void GItemView::paint_event(GPaintEvent& event) +{ + Painter painter(*this); + painter.set_clip_rect(event.rect()); + painter.fill_rect(event.rect(), Color::White); + painter.save(); + painter.translate(-horizontal_scrollbar().value(), -vertical_scrollbar().value()); + + auto column_metadata = model()->column_metadata(m_model_column); + const Font& font = column_metadata.font ? *column_metadata.font : this->font(); + + for (int item_index = 0; item_index < model()->row_count(); ++item_index) { + bool is_selected_item = item_index == model()->selected_index().row(); + Color background_color; + if (is_selected_item) { + background_color = is_focused() ? Color::from_rgb(0x84351a) : Color::from_rgb(0x606060); + } else { + background_color = Color::White; + } + + Rect item_rect = this->item_rect(item_index); + GModelIndex model_index(item_index, m_model_column); + + auto icon = model()->data(model_index, GModel::Role::Icon); + auto item_text = model()->data(model_index, GModel::Role::Display); + + Rect icon_rect = { 0, 0, 32, 32 }; + icon_rect.center_within(item_rect); + icon_rect.move_by(0, -font.glyph_height() - 6); + + if (icon.is_bitmap()) { + painter.draw_scaled_bitmap(icon_rect, icon.as_bitmap(), icon.as_bitmap().rect()); + } + + Rect text_rect { 0, icon_rect.bottom() + 6 + 1, font.width(item_text.to_string()), font.glyph_height() }; + text_rect.center_horizontally_within(item_rect); + text_rect.inflate(4, 4); + + Color text_color; + if (is_selected_item) + text_color = Color::White; + else + text_color = model()->data(model_index, GModel::Role::ForegroundColor).to_color(Color::Black); + painter.fill_rect(text_rect, background_color); + painter.draw_text(text_rect, item_text.to_string(), font, TextAlignment::Center, text_color); + }; + + painter.restore(); + + if (is_focused()) + painter.draw_rect({ { }, available_size() }, Color::from_rgb(0x84351a)); +} + +int GItemView::item_count() const +{ + if (!model()) + return 0; + return model()->row_count(); +} + +void GItemView::keydown_event(GKeyEvent& event) +{ + if (!model()) + return; + auto& model = *this->model(); + if (event.key() == KeyCode::Key_Return) { + model.activate(model.selected_index()); + return; + } + if (event.key() == KeyCode::Key_Up) { + GModelIndex new_index; + if (model.selected_index().is_valid()) + new_index = { model.selected_index().row() - 1, model.selected_index().column() }; + else + new_index = { 0, 0 }; + if (model.is_valid(new_index)) { + model.set_selected_index(new_index); + scroll_into_view(new_index, Orientation::Vertical); + update(); + } + return; + } + if (event.key() == KeyCode::Key_Down) { + GModelIndex new_index; + if (model.selected_index().is_valid()) + new_index = { model.selected_index().row() + 1, model.selected_index().column() }; + else + new_index = { 0, 0 }; + if (model.is_valid(new_index)) { + model.set_selected_index(new_index); + scroll_into_view(new_index, Orientation::Vertical); + update(); + } + return; + } + if (event.key() == KeyCode::Key_PageUp) { + int items_per_page = visible_content_rect().height() / effective_item_size().height(); + GModelIndex new_index(max(0, model.selected_index().row() - items_per_page), model.selected_index().column()); + if (model.is_valid(new_index)) { + model.set_selected_index(new_index); + scroll_into_view(new_index, Orientation::Vertical); + update(); + } + return; + } + if (event.key() == KeyCode::Key_PageDown) { + int items_per_page = visible_content_rect().height() / effective_item_size().height(); + GModelIndex new_index(min(model.row_count() - 1, model.selected_index().row() + items_per_page), model.selected_index().column()); + if (model.is_valid(new_index)) { + model.set_selected_index(new_index); + scroll_into_view(new_index, Orientation::Vertical); + update(); + } + return; + } + return GWidget::keydown_event(event); +} diff --git a/LibGUI/GItemView.h b/LibGUI/GItemView.h new file mode 100644 index 0000000000..f6a52a84ae --- /dev/null +++ b/LibGUI/GItemView.h @@ -0,0 +1,44 @@ +#pragma once + +#include +#include +#include +#include + +class GScrollBar; +class Painter; + +class GItemView : public GAbstractView { +public: + explicit GItemView(GWidget* parent); + virtual ~GItemView() override; + + int content_width() const; + int horizontal_padding() const { return m_horizontal_padding; } + + void scroll_into_view(const GModelIndex&, Orientation); + Size effective_item_size() const { return m_effective_item_size; } + + int model_column() const { return m_model_column; } + void set_model_column(int column) { m_model_column = column; } + + virtual const char* class_name() const override { return "GItemView"; } + +private: + virtual void did_update_model() override; + virtual void paint_event(GPaintEvent&) override; + virtual void resize_event(GResizeEvent&) override; + virtual void mousedown_event(GMouseEvent&) override; + virtual void keydown_event(GKeyEvent&) override; + + int item_count() const; + Rect item_rect(int item_index) const; + void update_content_size(); + + int m_horizontal_padding { 5 }; + int m_model_column { 0 }; + int m_visual_column_count { 0 }; + int m_visual_row_count { 0 }; + + Size m_effective_item_size { 80, 80 }; +}; diff --git a/LibGUI/GModel.h b/LibGUI/GModel.h index c565ae8cce..a20af686f0 100644 --- a/LibGUI/GModel.h +++ b/LibGUI/GModel.h @@ -42,7 +42,7 @@ public: const Font* font { nullptr }; }; - enum class Role { Display, Sort, Custom, ForegroundColor, BackgroundColor }; + enum class Role { Display, Sort, Custom, ForegroundColor, BackgroundColor, Icon }; virtual ~GModel(); diff --git a/LibGUI/GScrollableWidget.cpp b/LibGUI/GScrollableWidget.cpp index 8a7be7536c..a47e99e1d6 100644 --- a/LibGUI/GScrollableWidget.cpp +++ b/LibGUI/GScrollableWidget.cpp @@ -39,14 +39,21 @@ void GScrollableWidget::resize_event(GResizeEvent& event) } } +Size GScrollableWidget::available_size() const +{ + int available_width = width() - m_size_occupied_by_fixed_elements.width() - width_occupied_by_vertical_scrollbar(); + int available_height = height() - m_size_occupied_by_fixed_elements.height() - height_occupied_by_horizontal_scrollbar(); + return { available_width, available_height }; +} + void GScrollableWidget::update_scrollbar_ranges() { - int available_height = height() - m_size_occupied_by_fixed_elements.height() - height_occupied_by_horizontal_scrollbar(); - int excess_height = max(0, m_content_size.height() - available_height); + auto available_size = this->available_size(); + + int excess_height = max(0, m_content_size.height() - available_size.height()); m_vertical_scrollbar->set_range(0, excess_height); - int available_width = width() - m_size_occupied_by_fixed_elements.width() - width_occupied_by_vertical_scrollbar(); - int excess_width = max(0, m_content_size.width() - available_width); + int excess_width = max(0, m_content_size.width() - available_size.width()); m_horizontal_scrollbar->set_range(0, excess_width); m_vertical_scrollbar->set_big_step(visible_content_rect().height() - m_vertical_scrollbar->step()); diff --git a/LibGUI/GScrollableWidget.h b/LibGUI/GScrollableWidget.h index 43717565cd..30f430bb14 100644 --- a/LibGUI/GScrollableWidget.h +++ b/LibGUI/GScrollableWidget.h @@ -20,6 +20,8 @@ public: void set_scrollbars_enabled(bool); bool is_scrollbars_enabled() const { return m_scrollbars_enabled; } + Size available_size() const; + GScrollBar& vertical_scrollbar() { return *m_vertical_scrollbar; } const GScrollBar& vertical_scrollbar() const { return *m_vertical_scrollbar; } GScrollBar& horizontal_scrollbar() { return *m_horizontal_scrollbar; } diff --git a/LibGUI/GStackWidget.cpp b/LibGUI/GStackWidget.cpp index ba225a7547..dc6bd02f41 100644 --- a/LibGUI/GStackWidget.cpp +++ b/LibGUI/GStackWidget.cpp @@ -39,7 +39,7 @@ void GStackWidget::child_event(GChildEvent& event) if (event.type() == GEvent::ChildAdded) { if (!m_active_widget) set_active_widget(&child); - else + else if (m_active_widget != &child) child.set_visible(false); } else if (event.type() == GEvent::ChildRemoved) { if (m_active_widget == &child) { diff --git a/LibGUI/GTableView.cpp b/LibGUI/GTableView.cpp index f727fa647b..e753002ab7 100644 --- a/LibGUI/GTableView.cpp +++ b/LibGUI/GTableView.cpp @@ -30,9 +30,9 @@ void GTableView::update_content_size() void GTableView::did_update_model() { + GAbstractView::did_update_model(); update_content_size(); update(); - GAbstractView::did_update_model(); } Rect GTableView::row_rect(int item_index) const diff --git a/LibGUI/GTableView.h b/LibGUI/GTableView.h index 5382a219a6..bbd021fbeb 100644 --- a/LibGUI/GTableView.h +++ b/LibGUI/GTableView.h @@ -30,6 +30,8 @@ public: bool is_column_hidden(int) const; void set_column_hidden(int, bool); + virtual const char* class_name() const override { return "GTableView"; } + private: virtual void did_update_model() override; virtual void paint_event(GPaintEvent&) override; diff --git a/LibGUI/Makefile b/LibGUI/Makefile index d7bab746b6..1cd0beaf53 100644 --- a/LibGUI/Makefile +++ b/LibGUI/Makefile @@ -49,6 +49,7 @@ LIBGUI_OBJS = \ GDesktop.o \ GProgressBar.o \ GAbstractView.o \ + GItemView.o \ GWindow.o OBJS = $(SHAREDGRAPHICS_OBJS) $(LIBGUI_OBJS)