1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 23:47:45 +00:00

LibGUI: The UI calls it 'Icon view', fix the name in the code

This commit is contained in:
Ben Wiederhake 2020-05-01 02:09:04 +02:00 committed by Andreas Kling
parent 8e01356b2f
commit ef433cb367
9 changed files with 74 additions and 74 deletions

View file

@ -40,7 +40,7 @@ class FileSystemModel;
class Frame;
class GroupBox;
class HorizontalBoxLayout;
class ItemView;
class IconView;
class JsonArrayModel;
class KeyEvent;
class Label;

View file

@ -27,7 +27,7 @@
#include <AK/StringBuilder.h>
#include <Kernel/KeyCode.h>
#include <LibGUI/DragOperation.h>
#include <LibGUI/ItemView.h>
#include <LibGUI/IconView.h>
#include <LibGUI/Model.h>
#include <LibGUI/Painter.h>
#include <LibGUI/ScrollBar.h>
@ -37,7 +37,7 @@
namespace GUI {
ItemView::ItemView()
IconView::IconView()
{
set_fill_with_background_color(true);
set_background_role(ColorRole::Base);
@ -45,11 +45,11 @@ ItemView::ItemView()
horizontal_scrollbar().set_visible(false);
}
ItemView::~ItemView()
IconView::~IconView()
{
}
void ItemView::select_all()
void IconView::select_all()
{
selection().clear();
for (int item_index = 0; item_index < item_count(); ++item_index) {
@ -58,25 +58,25 @@ void ItemView::select_all()
}
}
void ItemView::scroll_into_view(const ModelIndex& index, Orientation orientation)
void IconView::scroll_into_view(const ModelIndex& index, Orientation orientation)
{
ScrollableWidget::scroll_into_view(item_rect(index.row()), orientation);
}
void ItemView::resize_event(ResizeEvent& event)
void IconView::resize_event(ResizeEvent& event)
{
AbstractView::resize_event(event);
update_content_size();
}
void ItemView::did_update_model(unsigned flags)
void IconView::did_update_model(unsigned flags)
{
AbstractView::did_update_model(flags);
update_content_size();
update();
}
void ItemView::update_content_size()
void IconView::update_content_size()
{
if (!model())
return set_content_size({});
@ -93,7 +93,7 @@ void ItemView::update_content_size()
set_content_size({ content_width, content_height });
}
Gfx::Rect ItemView::item_rect(int item_index) const
Gfx::Rect IconView::item_rect(int item_index) const
{
if (!m_visual_row_count || !m_visual_column_count)
return {};
@ -107,7 +107,7 @@ Gfx::Rect ItemView::item_rect(int item_index) const
};
}
Vector<int> ItemView::items_intersecting_rect(const Gfx::Rect& rect) const
Vector<int> IconView::items_intersecting_rect(const Gfx::Rect& rect) const
{
ASSERT(model());
const auto& column_metadata = model()->column_metadata(model_column());
@ -125,7 +125,7 @@ Vector<int> ItemView::items_intersecting_rect(const Gfx::Rect& rect) const
return item_indexes;
}
ModelIndex ItemView::index_at_event_position(const Gfx::Point& position) const
ModelIndex IconView::index_at_event_position(const Gfx::Point& position) const
{
ASSERT(model());
// FIXME: Since all items are the same size, just compute the clicked item index
@ -146,12 +146,12 @@ ModelIndex ItemView::index_at_event_position(const Gfx::Point& position) const
return {};
}
Gfx::Point ItemView::adjusted_position(const Gfx::Point& position) const
Gfx::Point IconView::adjusted_position(const Gfx::Point& position) const
{
return position.translated(0, vertical_scrollbar().value());
}
void ItemView::mousedown_event(MouseEvent& event)
void IconView::mousedown_event(MouseEvent& event)
{
if (!model())
return AbstractView::mousedown_event(event);
@ -183,7 +183,7 @@ void ItemView::mousedown_event(MouseEvent& event)
m_rubber_band_current = adjusted_position;
}
void ItemView::mouseup_event(MouseEvent& event)
void IconView::mouseup_event(MouseEvent& event)
{
if (m_rubber_banding && event.button() == MouseButton::Left) {
m_rubber_banding = false;
@ -193,7 +193,7 @@ void ItemView::mouseup_event(MouseEvent& event)
AbstractView::mouseup_event(event);
}
void ItemView::drag_move_event(DragEvent& event)
void IconView::drag_move_event(DragEvent& event)
{
auto index = index_at_event_position(event.position());
ModelIndex new_drop_candidate_index;
@ -212,7 +212,7 @@ void ItemView::drag_move_event(DragEvent& event)
event.accept();
}
void ItemView::mousemove_event(MouseEvent& event)
void IconView::mousemove_event(MouseEvent& event)
{
if (!model())
return AbstractView::mousemove_event(event);
@ -239,7 +239,7 @@ void ItemView::mousemove_event(MouseEvent& event)
AbstractView::mousemove_event(event);
}
void ItemView::get_item_rects(int item_index, const Gfx::Font& font, const Variant& item_text, Gfx::Rect& item_rect, Gfx::Rect& icon_rect, Gfx::Rect& text_rect) const
void IconView::get_item_rects(int item_index, const Gfx::Font& font, const Variant& item_text, Gfx::Rect& item_rect, Gfx::Rect& icon_rect, Gfx::Rect& text_rect) const
{
item_rect = this->item_rect(item_index);
icon_rect = { 0, 0, 32, 32 };
@ -251,7 +251,7 @@ void ItemView::get_item_rects(int item_index, const Gfx::Font& font, const Varia
text_rect.intersect(item_rect);
}
void ItemView::second_paint_event(PaintEvent& event)
void IconView::second_paint_event(PaintEvent& event)
{
if (!m_rubber_banding)
return;
@ -266,7 +266,7 @@ void ItemView::second_paint_event(PaintEvent& event)
painter.draw_rect(rubber_band_rect, palette().rubber_band_border());
}
void ItemView::paint_event(PaintEvent& event)
void IconView::paint_event(PaintEvent& event)
{
Color widget_background_color = palette().color(background_role());
Frame::paint_event(event);
@ -328,14 +328,14 @@ void ItemView::paint_event(PaintEvent& event)
};
}
int ItemView::item_count() const
int IconView::item_count() const
{
if (!model())
return 0;
return model()->row_count();
}
void ItemView::keydown_event(KeyEvent& event)
void IconView::keydown_event(KeyEvent& event)
{
if (!model())
return;

View file

@ -31,10 +31,10 @@
namespace GUI {
class ItemView : public AbstractView {
C_OBJECT(ItemView)
class IconView : public AbstractView {
C_OBJECT(IconView)
public:
virtual ~ItemView() override;
virtual ~IconView() override;
int content_width() const;
int horizontal_padding() const { return m_horizontal_padding; }
@ -50,7 +50,7 @@ public:
virtual void select_all() override;
private:
ItemView();
IconView();
virtual void did_update_model(unsigned flags) override;
virtual void paint_event(PaintEvent&) override;

View file

@ -28,8 +28,8 @@ OBJS = \
Frame.o \
GroupBox.o \
Icon.o \
IconView.o \
InputBox.o \
ItemView.o \
INILexer.o \
INISyntaxHighlighter.o \
JsonArrayModel.o \

View file

@ -40,14 +40,14 @@ MultiView::MultiView()
{
set_active_widget(nullptr);
set_content_margins({ 2, 2, 2, 2 });
m_item_view = add<ItemView>();
m_icon_view = add<IconView>();
m_table_view = add<TableView>();
#ifdef MULTIVIEW_WITH_COLUMNSVIEW
m_columns_view = add<ColumnsView>();
#endif
m_item_view->on_activation = [&](auto& index) {
m_icon_view->on_activation = [&](auto& index) {
if (on_activation)
on_activation(index);
};
@ -66,7 +66,7 @@ MultiView::MultiView()
if (on_selection_change)
on_selection_change();
};
m_item_view->on_selection_change = [this] {
m_icon_view->on_selection_change = [this] {
if (on_selection_change)
on_selection_change();
};
@ -81,7 +81,7 @@ MultiView::MultiView()
if (on_context_menu_request)
on_context_menu_request(index, event);
};
m_item_view->on_context_menu_request = [this](auto& index, auto& event) {
m_icon_view->on_context_menu_request = [this](auto& index, auto& event) {
if (on_context_menu_request)
on_context_menu_request(index, event);
};
@ -96,7 +96,7 @@ MultiView::MultiView()
if (on_drop)
on_drop(index, event);
};
m_item_view->on_drop = [this](auto& index, auto& event) {
m_icon_view->on_drop = [this](auto& index, auto& event) {
if (on_drop)
on_drop(index, event);
};
@ -121,7 +121,7 @@ void MultiView::set_view_mode(ViewMode mode)
return;
m_view_mode = mode;
update();
if (mode == ViewMode::List) {
if (mode == ViewMode::Table) {
set_active_widget(m_table_view);
return;
}
@ -132,7 +132,7 @@ void MultiView::set_view_mode(ViewMode mode)
}
#endif
if (mode == ViewMode::Icon) {
set_active_widget(m_item_view);
set_active_widget(m_icon_view);
return;
}
ASSERT_NOT_REACHED();
@ -153,7 +153,7 @@ void MultiView::set_model_column(int column)
if (m_model_column == column)
return;
m_model_column = column;
m_item_view->set_model_column(column);
m_icon_view->set_model_column(column);
#ifdef MULTIVIEW_WITH_COLUMNSVIEW
m_columns_view->set_model_column(column);
#endif
@ -168,7 +168,7 @@ void MultiView::build_actions()
{
m_view_as_table_action = Action::create_checkable(
"Table view", Gfx::Bitmap::load_from_file("/res/icons/16x16/table-view.png"), [this](auto&) {
set_view_mode(ViewMode::List);
set_view_mode(ViewMode::Table);
});
m_view_as_icons_action = Action::create_checkable(

View file

@ -28,7 +28,7 @@
#include <LibGUI/Action.h>
#include <LibGUI/ColumnsView.h>
#include <LibGUI/ItemView.h>
#include <LibGUI/IconView.h>
#include <LibGUI/StackWidget.h>
#include <LibGUI/TableView.h>
@ -50,7 +50,7 @@ public:
Function<void(const ModelIndex&, const DropEvent&)> on_drop;
enum ViewMode {
List,
Table,
Columns,
Icon
};
@ -65,14 +65,14 @@ public:
GUI::AbstractView& current_view()
{
switch (m_view_mode) {
case ViewMode::List:
case ViewMode::Table:
return *m_table_view;
#ifdef MULTIVIEW_WITH_COLUMNSVIEW
case ViewMode::Columns:
return *m_columns_view;
#endif
case ViewMode::Icon:
return *m_item_view;
return *m_icon_view;
default:
ASSERT_NOT_REACHED();
}
@ -85,7 +85,7 @@ public:
void for_each_view_implementation(Callback callback)
{
callback(*m_table_view);
callback(*m_item_view);
callback(*m_icon_view);
#ifdef MULTIVIEW_WITH_COLUMNSVIEW
callback(*m_columns_view);
#endif
@ -113,7 +113,7 @@ private:
RefPtr<Model> m_model;
RefPtr<TableView> m_table_view;
RefPtr<ItemView> m_item_view;
RefPtr<IconView> m_icon_view;
#ifdef MULTIVIEW_WITH_COLUMNSVIEW
RefPtr<ColumnsView> m_columns_view;
#endif