display

Layout and Rendering TUI library
git clone git://git.dimitrijedobrota.com/display.git
Log | Files | Refs | README | LICENSE | HACKING | CONTRIBUTING | CODE_OF_CONDUCT | BUILDING
commit 09e7edc5a481251f57e1038573da37d3503339b7
parent fae1cade3835e915157b194f62f128dd12ad1bd3
author Dimitrije Dobrota < mail@dimitrijedobrota.com >
date Tue, 18 Feb 2025 04:15:33 +0100

Fix gaps in LayoutRigid

Diffstat:
M CMakeLists.txt | + -
M include/display/layout_rigid.hpp | ++++++++++++++++++++++++++++ ----------

2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/ CMakeLists.txt b/ CMakeLists.txt

@@ -4,7 +4,7 @@ include(cmake/prelude.cmake)


project(
display
VERSION 0.1.27
VERSION 0.1.28
DESCRIPTION "TUI library"
HOMEPAGE_URL "git://git.dimitrijedobrota.com/display.git"
LANGUAGES CXX

diff --git a/ include/display/layout_rigid.hpp b/ include/display/layout_rigid.hpp

@@ -23,25 +23,35 @@ private:


aplace_t place(std::size_t idx) const override
{
const auto calc = [&]<typename R>(dim_t share) -> R
const auto [m, n] = m_grid;
const auto [w, h] = this->adim();
const sz_t unw = w / m;
const sz_t unh = h / n;

const auto calc = [&]<typename R>(const R share, bool addw, bool addh) -> R
{
return {static_cast<sz_t>(this->awth() / m_grid.width * share.width),
static_cast<sz_t>(this->ahgt() / m_grid.height * share.height)};
const auto [sw, sh] = share;

const sz_t width = addw ? w - (unw * (m - sw)) : unw * sw;
const sz_t height = addh ? h - (unh * (n - sh)) : unh * sh;

return {width, height};
};

const auto start = calc.template operator()<pos_t>(m_recs[idx].start);
const auto dim = calc.template operator()<dim_t>(m_recs[idx].dim);
const auto start = calc(m_recs[idx].start, false, false);
const auto dim = calc(m_recs[idx].dim, m_recs[idx].addw, m_recs[idx].addh);
return {this->apos() + start, dim};
}

dim_t m_grid;

struct record_t
{
dim_t start = {0xFFFF, 0xFFFF};
pos_t start;
dim_t dim;
bool addw = false;
bool addh = false;
};

dim_t m_grid;
std::vector<record_t> m_recs;
};

@@ -78,7 +88,7 @@ LayoutRigid<T>::LayoutRigid(aplace_t aplc, layout_t layout)

continue;
}

insert(m_recs[crnt].dim.width, cnt, m_recs[crnt].start.width, total);
insert(m_recs[crnt].dim.width, cnt, m_recs[crnt].start.x, total);
total += cnt, cnt = 0;
}
}

@@ -94,10 +104,18 @@ LayoutRigid<T>::LayoutRigid(aplace_t aplc, layout_t layout)

continue;
}

insert(m_recs[crnt].dim.height, cnt, m_recs[crnt].start.height, total);
insert(m_recs[crnt].dim.height, cnt, m_recs[crnt].start.y, total);
total += cnt, cnt = 0;
}
}

for (std::size_t i = 0U; i < m_grid.height; i++) {
m_recs[layout[i][m_grid.width - 1]].addw = true;
}

for (std::size_t i = 0U; i < m_grid.width; i++) {
m_recs[layout[m_grid.height - 1][i]].addh = true;
}
}

template<typename T>