From f2ddf230dc7224f96842455612eda2c29fd01d95 Mon Sep 17 00:00:00 2001 From: King_DuckZ Date: Fri, 14 Feb 2025 01:16:53 +0000 Subject: [PATCH] Reorder methods to match declaration order --- src/qt/widgets/block_grid.cpp | 46 +++++++++++++++++------------------ 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/src/qt/widgets/block_grid.cpp b/src/qt/widgets/block_grid.cpp index ece8ae6..35cb795 100644 --- a/src/qt/widgets/block_grid.cpp +++ b/src/qt/widgets/block_grid.cpp @@ -104,29 +104,6 @@ std::size_t BlockGrid::size() const { return m_icons.size(); } -unsigned int BlockGrid::rows() const { - if (m_rows) { - return m_rows; - } - else { - const auto widget_h = static_cast(std::max(this->height(), g_icon_spacing)); - const auto ico_spacing_uns = static_cast(g_icon_spacing); - return (widget_h - ico_spacing_uns) / (icon_size().height() + ico_spacing_uns); - } -} - -unsigned int BlockGrid::columns() const { - if (m_columns) { - return m_columns; - } - else { - const auto widget_w = static_cast(std::max(this->width(), g_icon_spacing)); - const auto ico_spacing_uns = static_cast(g_icon_spacing); - - return (widget_w - ico_spacing_uns) / (icon_size().width() + ico_spacing_uns); - } -} - void BlockGrid::paintEvent (QPaintEvent* event) { QPainter painter(this); const int max_col = static_cast(this->columns()); @@ -186,6 +163,29 @@ void BlockGrid::advance_frame() { this->update(); } +unsigned int BlockGrid::rows() const { + if (m_rows) { + return m_rows; + } + else { + const auto widget_h = static_cast(std::max(this->height(), g_icon_spacing)); + const auto ico_spacing_uns = static_cast(g_icon_spacing); + return (widget_h - ico_spacing_uns) / (icon_size().height() + ico_spacing_uns); + } +} + +unsigned int BlockGrid::columns() const { + if (m_columns) { + return m_columns; + } + else { + const auto widget_w = static_cast(std::max(this->width(), g_icon_spacing)); + const auto ico_spacing_uns = static_cast(g_icon_spacing); + + return (widget_w - ico_spacing_uns) / (icon_size().width() + ico_spacing_uns); + } +} + std::pair BlockGrid::locate_icon_index_at(QPoint pt) const { if (pt.x() < g_icon_spacing or pt.y() < g_icon_spacing) return {-1, QPoint()};