mirror of
https://github.com/RGBCube/serenity
synced 2025-07-26 07:27:45 +00:00
LibGfx: Unpublish Gfx::Rect from global namespace
This commit is contained in:
parent
c39d44fc2e
commit
20cfd2a6bf
78 changed files with 262 additions and 260 deletions
|
@ -168,11 +168,11 @@ void CursorTool::set_rubber_band_position(const Gfx::Point& position)
|
|||
m_editor.form_widget().update();
|
||||
}
|
||||
|
||||
Rect CursorTool::rubber_band_rect() const
|
||||
Gfx::Rect CursorTool::rubber_band_rect() const
|
||||
{
|
||||
if (!m_rubber_banding)
|
||||
return {};
|
||||
return Rect::from_two_points(m_rubber_band_origin, m_rubber_band_position);
|
||||
return Gfx::Rect::from_two_points(m_rubber_band_origin, m_rubber_band_position);
|
||||
}
|
||||
|
||||
void CursorTool::on_second_paint(GUI::Painter& painter, GUI::PaintEvent&)
|
||||
|
|
|
@ -324,23 +324,23 @@ int main(int argc, char** argv)
|
|||
dbg() << " }";
|
||||
dbg() << " " << parameter.name << " = *" << parameter.name << "_impl;";
|
||||
dbg() << " }";
|
||||
} else if (parameter.type == "Color") {
|
||||
} else if (parameter.type == "Gfx::Color") {
|
||||
dbg() << " u32 " << parameter.name << "_rgba = 0;";
|
||||
dbg() << " stream >> " << parameter.name << "_rgba;";
|
||||
dbg() << " " << parameter.name << " = Gfx::Color::from_rgba(" << parameter.name << "_rgba);";
|
||||
} else if (parameter.type == "Size") {
|
||||
} else if (parameter.type == "Gfx::Size") {
|
||||
dbg() << " int " << parameter.name << "_width = 0;";
|
||||
dbg() << " stream >> " << parameter.name << "_width;";
|
||||
dbg() << " int " << parameter.name << "_height = 0;";
|
||||
dbg() << " stream >> " << parameter.name << "_height;";
|
||||
dbg() << " " << parameter.name << " = { " << parameter.name << "_width, " << parameter.name << "_height };";
|
||||
} else if (parameter.type == "Point") {
|
||||
} else if (parameter.type == "Gfx::Point") {
|
||||
dbg() << " int " << parameter.name << "_x = 0;";
|
||||
dbg() << " stream >> " << parameter.name << "_x;";
|
||||
dbg() << " int " << parameter.name << "_y = 0;";
|
||||
dbg() << " stream >> " << parameter.name << "_y;";
|
||||
dbg() << " " << parameter.name << " = { " << parameter.name << "_x, " << parameter.name << "_y };";
|
||||
} else if (parameter.type == "Rect") {
|
||||
} else if (parameter.type == "Gfx::Rect") {
|
||||
dbg() << " int " << parameter.name << "_x = 0;";
|
||||
dbg() << " stream >> " << parameter.name << "_x;";
|
||||
dbg() << " int " << parameter.name << "_y = 0;";
|
||||
|
@ -350,7 +350,7 @@ int main(int argc, char** argv)
|
|||
dbg() << " int " << parameter.name << "_height = 0;";
|
||||
dbg() << " stream >> " << parameter.name << "_height;";
|
||||
dbg() << " " << parameter.name << " = { " << parameter.name << "_x, " << parameter.name << "_y, " << parameter.name << "_width, " << parameter.name << "_height };";
|
||||
} else if (parameter.type == "Vector<Rect>") {
|
||||
} else if (parameter.type == "Vector<Gfx::Rect>") {
|
||||
dbg() << " int " << parameter.name << "_size = 0;";
|
||||
dbg() << " stream >> " << parameter.name << "_size;";
|
||||
dbg() << " for (int i = 0; i < " << parameter.name << "_size; ++i) {";
|
||||
|
@ -399,20 +399,20 @@ int main(int argc, char** argv)
|
|||
dbg() << " stream << static_cast<i32>(m_" << parameter.name << ".length());";
|
||||
dbg() << " stream << m_" << parameter.name << ";";
|
||||
dbg() << " }";
|
||||
} else if (parameter.type == "Color") {
|
||||
} else if (parameter.type == "Gfx::Color") {
|
||||
dbg() << " stream << m_" << parameter.name << ".value();";
|
||||
} else if (parameter.type == "Size") {
|
||||
} else if (parameter.type == "Gfx::Size") {
|
||||
dbg() << " stream << m_" << parameter.name << ".width();";
|
||||
dbg() << " stream << m_" << parameter.name << ".height();";
|
||||
} else if (parameter.type == "Point") {
|
||||
} else if (parameter.type == "Gfx::Point") {
|
||||
dbg() << " stream << m_" << parameter.name << ".x();";
|
||||
dbg() << " stream << m_" << parameter.name << ".y();";
|
||||
} else if (parameter.type == "Rect") {
|
||||
} else if (parameter.type == "Gfx::Rect") {
|
||||
dbg() << " stream << m_" << parameter.name << ".x();";
|
||||
dbg() << " stream << m_" << parameter.name << ".y();";
|
||||
dbg() << " stream << m_" << parameter.name << ".width();";
|
||||
dbg() << " stream << m_" << parameter.name << ".height();";
|
||||
} else if (parameter.type == "Vector<Rect>") {
|
||||
} else if (parameter.type == "Vector<Gfx::Rect>") {
|
||||
dbg() << " stream << m_" << parameter.name << ".size();";
|
||||
dbg() << " for (auto& rect : m_" << parameter.name << ") {";
|
||||
dbg() << " stream << rect.x();";
|
||||
|
|
|
@ -59,7 +59,7 @@ VBWidget::~VBWidget()
|
|||
m_gwidget->parent()->remove_child(*m_gwidget);
|
||||
}
|
||||
|
||||
Rect VBWidget::rect() const
|
||||
Gfx::Rect VBWidget::rect() const
|
||||
{
|
||||
return m_gwidget->window_relative_rect();
|
||||
}
|
||||
|
@ -80,7 +80,7 @@ bool VBWidget::is_selected() const
|
|||
return m_form.is_selected(*this);
|
||||
}
|
||||
|
||||
Rect VBWidget::grabber_rect(Direction direction) const
|
||||
Gfx::Rect VBWidget::grabber_rect(Direction direction) const
|
||||
{
|
||||
int grabber_size = 5;
|
||||
int half_grabber_size = grabber_size / 2;
|
||||
|
|
|
@ -79,10 +79,10 @@ public:
|
|||
|
||||
bool is_selected() const;
|
||||
|
||||
Rect rect() const;
|
||||
Gfx::Rect rect() const;
|
||||
void set_rect(const Gfx::Rect&);
|
||||
|
||||
Rect grabber_rect(Direction) const;
|
||||
Gfx::Rect grabber_rect(Direction) const;
|
||||
Direction grabber_at(const Gfx::Point&) const;
|
||||
|
||||
GUI::Widget* gwidget() { return m_gwidget; }
|
||||
|
@ -98,7 +98,7 @@ public:
|
|||
|
||||
void property_did_change();
|
||||
|
||||
Rect transform_origin_rect() const { return m_transform_origin_rect; }
|
||||
Gfx::Rect transform_origin_rect() const { return m_transform_origin_rect; }
|
||||
void capture_transform_origin_rect();
|
||||
|
||||
bool is_in_layout() const;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue