mirror of https://github.com/AxioDL/metaforce.git
Working scroll wheel functionality
This commit is contained in:
parent
725990da45
commit
4866ac6d4c
|
@ -108,8 +108,18 @@ class FileBrowser : public ModalWindow
|
||||||
std::string m_sizeCol = "Size";
|
std::string m_sizeCol = "Size";
|
||||||
std::vector<std::string> m_sizes = {"s1", "s2", "s3"};
|
std::vector<std::string> m_sizes = {"s1", "s2", "s3"};
|
||||||
|
|
||||||
|
TableDataBind()
|
||||||
|
{
|
||||||
|
for (int i=0 ; i<100 ; ++i)
|
||||||
|
{
|
||||||
|
m_names.push_back(HECL::Format("%d", i));
|
||||||
|
m_types.push_back(HECL::Format("%d", i));
|
||||||
|
m_sizes.push_back(HECL::Format("%d", i));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
size_t columnCount() const {return 3;}
|
size_t columnCount() const {return 3;}
|
||||||
size_t rowCount() const {return 3;}
|
size_t rowCount() const {return 103;}
|
||||||
|
|
||||||
const std::string* header(size_t cIdx) const
|
const std::string* header(size_t cIdx) const
|
||||||
{
|
{
|
||||||
|
|
|
@ -18,6 +18,7 @@ public:
|
||||||
private:
|
private:
|
||||||
View* m_contentView = nullptr;
|
View* m_contentView = nullptr;
|
||||||
int m_scroll[2] = {};
|
int m_scroll[2] = {};
|
||||||
|
int m_targetScroll[2] = {};
|
||||||
|
|
||||||
public:
|
public:
|
||||||
ScrollView(ViewResources& res, View& parentView);
|
ScrollView(ViewResources& res, View& parentView);
|
||||||
|
@ -28,7 +29,13 @@ public:
|
||||||
}
|
}
|
||||||
|
|
||||||
void scroll(const boo::SWindowCoord& coord, const boo::SScrollDelta& scroll);
|
void scroll(const boo::SWindowCoord& coord, const boo::SScrollDelta& scroll);
|
||||||
|
int getScrollX() const {return m_scroll[0];}
|
||||||
|
int getScrollY() const {return m_scroll[1];}
|
||||||
|
|
||||||
|
int nominalWidth() const {return subRect().size[0];}
|
||||||
|
int nominalHeight() const {return subRect().size[1];}
|
||||||
|
|
||||||
|
void think();
|
||||||
void resized(const boo::SWindowRect& root, const boo::SWindowRect& sub);
|
void resized(const boo::SWindowRect& root, const boo::SWindowRect& sub);
|
||||||
void draw(boo::IGraphicsCommandQueue* gfxQ);
|
void draw(boo::IGraphicsCommandQueue* gfxQ);
|
||||||
};
|
};
|
||||||
|
|
|
@ -51,20 +51,24 @@ class Table : public View
|
||||||
std::vector<std::vector<std::unique_ptr<CellView>>> m_cellViews;
|
std::vector<std::vector<std::unique_ptr<CellView>>> m_cellViews;
|
||||||
bool m_header = false;
|
bool m_header = false;
|
||||||
|
|
||||||
SolidShaderVert m_verts[SPECTER_TABLE_MAX_ROWS * 6];
|
|
||||||
boo::IGraphicsBufferD* m_vertsBuf = nullptr;
|
|
||||||
boo::IVertexFormat* m_vtxFmt = nullptr; /* OpenGL only */
|
|
||||||
boo::IShaderDataBinding* m_shaderBinding = nullptr;
|
|
||||||
size_t m_visibleRows = 0;
|
|
||||||
void _setRowVerts(const boo::SWindowRect& rowsRect);
|
|
||||||
|
|
||||||
ViewChild<std::unique_ptr<ScrollView>> m_scroll;
|
ViewChild<std::unique_ptr<ScrollView>> m_scroll;
|
||||||
|
|
||||||
struct RowsView : public View
|
struct RowsView : public View
|
||||||
{
|
{
|
||||||
Table& m_t;
|
Table& m_t;
|
||||||
RowsView(Table& t, ViewResources& res) : View(res, t), m_t(t) {}
|
|
||||||
|
SolidShaderVert m_verts[SPECTER_TABLE_MAX_ROWS * 6];
|
||||||
|
boo::IGraphicsBufferD* m_vertsBuf = nullptr;
|
||||||
|
boo::IVertexFormat* m_vtxFmt = nullptr; /* OpenGL only */
|
||||||
|
boo::IShaderDataBinding* m_shaderBinding = nullptr;
|
||||||
|
size_t m_visibleStart = 0;
|
||||||
|
size_t m_visibleRows = 0;
|
||||||
|
boo::SWindowRect m_scissorRect;
|
||||||
|
void _setRowVerts(const boo::SWindowRect& rowsRect, const boo::SWindowRect& scissor);
|
||||||
|
|
||||||
|
RowsView(Table& t, ViewResources& res);
|
||||||
int nominalHeight() const;
|
int nominalHeight() const;
|
||||||
|
int nominalWidth() const {return m_t.m_scroll.m_view->nominalWidth();}
|
||||||
void resized(const boo::SWindowRect& root, const boo::SWindowRect& sub,
|
void resized(const boo::SWindowRect& root, const boo::SWindowRect& sub,
|
||||||
const boo::SWindowRect& scissor);
|
const boo::SWindowRect& scissor);
|
||||||
void draw(boo::IGraphicsCommandQueue* gfxQ);
|
void draw(boo::IGraphicsCommandQueue* gfxQ);
|
||||||
|
@ -82,6 +86,7 @@ public:
|
||||||
void mouseLeave(const boo::SWindowCoord&);
|
void mouseLeave(const boo::SWindowCoord&);
|
||||||
void scroll(const boo::SWindowCoord&, const boo::SScrollDelta&);
|
void scroll(const boo::SWindowCoord&, const boo::SScrollDelta&);
|
||||||
|
|
||||||
|
void think();
|
||||||
void updateData();
|
void updateData();
|
||||||
void resized(const boo::SWindowRect& root, const boo::SWindowRect& sub);
|
void resized(const boo::SWindowRect& root, const boo::SWindowRect& sub);
|
||||||
void draw(boo::IGraphicsCommandQueue* gfxQ);
|
void draw(boo::IGraphicsCommandQueue* gfxQ);
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
|
|
||||||
namespace Specter
|
namespace Specter
|
||||||
{
|
{
|
||||||
|
#define MAX_SCROLL_SPEED 100
|
||||||
|
|
||||||
ScrollView::ScrollView(ViewResources& res, View& parentView)
|
ScrollView::ScrollView(ViewResources& res, View& parentView)
|
||||||
: View(res, parentView)
|
: View(res, parentView)
|
||||||
|
@ -11,9 +12,60 @@ ScrollView::ScrollView(ViewResources& res, View& parentView)
|
||||||
|
|
||||||
void ScrollView::scroll(const boo::SWindowCoord& coord, const boo::SScrollDelta& scroll)
|
void ScrollView::scroll(const boo::SWindowCoord& coord, const boo::SScrollDelta& scroll)
|
||||||
{
|
{
|
||||||
m_scroll[0] += scroll.delta[0];
|
if (m_contentView)
|
||||||
m_scroll[1] += scroll.delta[1];
|
{
|
||||||
updateSize();
|
double mult = 10.0;
|
||||||
|
if (scroll.isFine)
|
||||||
|
mult = 1.0;
|
||||||
|
m_targetScroll[0] += scroll.delta[0] * mult;
|
||||||
|
m_targetScroll[1] += scroll.delta[1] * mult;
|
||||||
|
m_targetScroll[1] = std::min(m_targetScroll[1], 0);
|
||||||
|
if (scroll.isFine)
|
||||||
|
{
|
||||||
|
m_scroll[0] = m_targetScroll[0];
|
||||||
|
m_scroll[1] = m_targetScroll[1];
|
||||||
|
updateSize();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
m_scroll[0] = 0;
|
||||||
|
m_scroll[1] = 0;
|
||||||
|
m_targetScroll[0] = 0;
|
||||||
|
m_targetScroll[1] = 0;
|
||||||
|
updateSize();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void ScrollView::think()
|
||||||
|
{
|
||||||
|
bool update = false;
|
||||||
|
|
||||||
|
int xSpeed = std::max(1, std::min(abs(m_targetScroll[0] - m_scroll[0]) / 10, MAX_SCROLL_SPEED));
|
||||||
|
if (m_scroll[0] < m_targetScroll[0])
|
||||||
|
{
|
||||||
|
m_scroll[0] += xSpeed;
|
||||||
|
update = true;
|
||||||
|
}
|
||||||
|
else if (m_scroll[0] > m_targetScroll[0])
|
||||||
|
{
|
||||||
|
m_scroll[0] -= xSpeed;
|
||||||
|
update = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
int ySpeed = std::max(1, std::min(abs(m_targetScroll[1] - m_scroll[1]) / 10, MAX_SCROLL_SPEED));
|
||||||
|
if (m_scroll[1] < m_targetScroll[1])
|
||||||
|
{
|
||||||
|
m_scroll[1] += ySpeed;
|
||||||
|
update = true;
|
||||||
|
}
|
||||||
|
else if (m_scroll[1] > m_targetScroll[1])
|
||||||
|
{
|
||||||
|
m_scroll[1] -= ySpeed;
|
||||||
|
update = true;
|
||||||
|
}
|
||||||
|
if (update)
|
||||||
|
updateSize();
|
||||||
}
|
}
|
||||||
|
|
||||||
void ScrollView::resized(const boo::SWindowRect& root, const boo::SWindowRect& sub)
|
void ScrollView::resized(const boo::SWindowRect& root, const boo::SWindowRect& sub)
|
||||||
|
@ -23,7 +75,9 @@ void ScrollView::resized(const boo::SWindowRect& root, const boo::SWindowRect& s
|
||||||
{
|
{
|
||||||
boo::SWindowRect cRect = sub;
|
boo::SWindowRect cRect = sub;
|
||||||
cRect.location[0] += m_scroll[0];
|
cRect.location[0] += m_scroll[0];
|
||||||
cRect.location[1] += sub.size[1] - m_contentView->nominalHeight() + m_scroll[1];
|
cRect.location[1] += sub.size[1] - m_contentView->nominalHeight() - m_scroll[1];
|
||||||
|
cRect.size[0] = m_contentView->nominalWidth();
|
||||||
|
cRect.size[1] = m_contentView->nominalHeight();
|
||||||
m_contentView->resized(root, cRect, sub);
|
m_contentView->resized(root, cRect, sub);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,6 +9,16 @@ namespace Specter
|
||||||
|
|
||||||
Table::Table(ViewResources& res, View& parentView, ITableDataBinding* data, ITableStateBinding* state)
|
Table::Table(ViewResources& res, View& parentView, ITableDataBinding* data, ITableStateBinding* state)
|
||||||
: View(res, parentView), m_data(data), m_state(state), m_rowsView(*this, res)
|
: View(res, parentView), m_data(data), m_state(state), m_rowsView(*this, res)
|
||||||
|
{
|
||||||
|
commitResources(res);
|
||||||
|
|
||||||
|
m_scroll.m_view.reset(new ScrollView(res, *this));
|
||||||
|
m_scroll.m_view->setContentView(&m_rowsView);
|
||||||
|
updateData();
|
||||||
|
}
|
||||||
|
|
||||||
|
Table::RowsView::RowsView(Table& t, ViewResources& res)
|
||||||
|
: View(res, t), m_t(t)
|
||||||
{
|
{
|
||||||
m_vertsBuf = res.m_factory->newDynamicBuffer(boo::BufferUse::Vertex, sizeof(SolidShaderVert),
|
m_vertsBuf = res.m_factory->newDynamicBuffer(boo::BufferUse::Vertex, sizeof(SolidShaderVert),
|
||||||
SPECTER_TABLE_MAX_ROWS * 6);
|
SPECTER_TABLE_MAX_ROWS * 6);
|
||||||
|
@ -35,40 +45,49 @@ Table::Table(ViewResources& res, View& parentView, ITableDataBinding* data, ITab
|
||||||
nullptr, 1, bufs, 0, nullptr);
|
nullptr, 1, bufs, 0, nullptr);
|
||||||
}
|
}
|
||||||
commitResources(res);
|
commitResources(res);
|
||||||
|
|
||||||
m_scroll.m_view.reset(new ScrollView(res, *this));
|
|
||||||
m_scroll.m_view->setContentView(&m_rowsView);
|
|
||||||
updateData();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Table::CellView::CellView(Table& t, ViewResources& res)
|
Table::CellView::CellView(Table& t, ViewResources& res)
|
||||||
: View(res, t), m_t(t), m_text(new TextView(res, *this, res.m_mainFont)) {}
|
: View(res, t), m_t(t), m_text(new TextView(res, *this, res.m_mainFont)) {}
|
||||||
|
|
||||||
void Table::_setRowVerts(const boo::SWindowRect& rowsRect)
|
void Table::RowsView::_setRowVerts(const boo::SWindowRect& sub, const boo::SWindowRect& scissor)
|
||||||
{
|
{
|
||||||
SolidShaderVert* v = m_verts;
|
SolidShaderVert* v = m_verts;
|
||||||
const ThemeData& theme = rootView().themeData();
|
const ThemeData& theme = rootView().themeData();
|
||||||
|
|
||||||
|
if (m_t.m_cellViews.empty())
|
||||||
|
return;
|
||||||
|
|
||||||
float pf = rootView().viewRes().pixelFactor();
|
float pf = rootView().viewRes().pixelFactor();
|
||||||
|
int div = sub.size[0] / m_t.m_cellViews.size();
|
||||||
|
int spacing = (ROW_HEIGHT + ROW_SPACING) * pf;
|
||||||
int rowHeight = ROW_HEIGHT * pf;
|
int rowHeight = ROW_HEIGHT * pf;
|
||||||
int rowSpace = ROW_SPACING * pf;
|
int yOff = 0;
|
||||||
int hAdv = rowHeight + rowSpace;
|
int idx = 0;
|
||||||
int yOff = rowsRect.size[1] - hAdv;
|
while (sub.location[1] + yOff < scissor.location[1] + scissor.size[1] || (idx & 1) != 0)
|
||||||
|
{
|
||||||
|
yOff += spacing;
|
||||||
|
++idx;
|
||||||
|
}
|
||||||
|
int startIdx = std::max(0, int(m_t.m_rows) - idx);
|
||||||
|
|
||||||
size_t i;
|
size_t i;
|
||||||
for (i=0 ; i<SPECTER_TABLE_MAX_ROWS && (yOff + rowHeight + rowSpace) >= 0 ; ++i)
|
for (i=0 ; i<SPECTER_TABLE_MAX_ROWS && (sub.location[1] + yOff + spacing) >= scissor.location[1] ; ++i)
|
||||||
{
|
{
|
||||||
v[0].m_pos.assign(0, yOff, 0);
|
v[0].m_pos.assign(0, yOff, 0);
|
||||||
v[0].m_color = (i&1) ? theme.tableCellBg1() : theme.tableCellBg2();
|
v[0].m_color = (i&1) ? theme.tableCellBg1() : theme.tableCellBg2();
|
||||||
v[1] = v[0];
|
v[1] = v[0];
|
||||||
v[2].m_pos.assign(0, yOff - rowHeight, 0);
|
v[2].m_pos.assign(0, yOff - rowHeight, 0);
|
||||||
v[2].m_color = v[0].m_color;
|
v[2].m_color = v[0].m_color;
|
||||||
v[3].m_pos.assign(rowsRect.size[0], yOff, 0);
|
v[3].m_pos.assign(sub.size[0], yOff, 0);
|
||||||
v[3].m_color = v[0].m_color;
|
v[3].m_color = v[0].m_color;
|
||||||
v[4].m_pos.assign(rowsRect.size[0], yOff - rowHeight, 0);
|
v[4].m_pos.assign(sub.size[0], yOff - rowHeight, 0);
|
||||||
v[4].m_color = v[0].m_color;
|
v[4].m_color = v[0].m_color;
|
||||||
v[5] = v[4];
|
v[5] = v[4];
|
||||||
yOff -= hAdv;
|
yOff -= spacing;
|
||||||
v += 6;
|
v += 6;
|
||||||
}
|
}
|
||||||
|
m_visibleStart = startIdx;
|
||||||
m_visibleRows = i;
|
m_visibleRows = i;
|
||||||
m_vertsBuf->load(m_verts, sizeof(SolidShaderVert) * 6 * i);
|
m_vertsBuf->load(m_verts, sizeof(SolidShaderVert) * 6 * i);
|
||||||
}
|
}
|
||||||
|
@ -117,6 +136,12 @@ void Table::scroll(const boo::SWindowCoord& coord, const boo::SScrollDelta& scro
|
||||||
m_scroll.scroll(coord, scroll);
|
m_scroll.scroll(coord, scroll);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Table::think()
|
||||||
|
{
|
||||||
|
if (m_scroll.m_view)
|
||||||
|
m_scroll.m_view->think();
|
||||||
|
}
|
||||||
|
|
||||||
void Table::updateData()
|
void Table::updateData()
|
||||||
{
|
{
|
||||||
m_header = false;
|
m_header = false;
|
||||||
|
@ -183,21 +208,6 @@ void Table::resized(const boo::SWindowRect& root, const boo::SWindowRect& sub)
|
||||||
hv->resized(root, cell);
|
hv->resized(root, cell);
|
||||||
cell.location[0] += div;
|
cell.location[0] += div;
|
||||||
}
|
}
|
||||||
|
|
||||||
int spacing = ROW_HEIGHT + ROW_SPACING * pf;
|
|
||||||
cell.location[0] = sub.location[0];
|
|
||||||
int hStart = cell.location[1];
|
|
||||||
for (auto& col : m_cellViews)
|
|
||||||
{
|
|
||||||
cell.location[1] = hStart;
|
|
||||||
for (std::unique_ptr<CellView>& cv : col)
|
|
||||||
{
|
|
||||||
cell.location[1] -= spacing;
|
|
||||||
if (cv)
|
|
||||||
cv->resized(root, cell);
|
|
||||||
}
|
|
||||||
cell.location[0] += div;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int Table::RowsView::nominalHeight() const
|
int Table::RowsView::nominalHeight() const
|
||||||
|
@ -209,7 +219,33 @@ int Table::RowsView::nominalHeight() const
|
||||||
void Table::RowsView::resized(const boo::SWindowRect& root, const boo::SWindowRect& sub,
|
void Table::RowsView::resized(const boo::SWindowRect& root, const boo::SWindowRect& sub,
|
||||||
const boo::SWindowRect& scissor)
|
const boo::SWindowRect& scissor)
|
||||||
{
|
{
|
||||||
m_t._setRowVerts(sub);
|
View::resized(root, sub);
|
||||||
|
_setRowVerts(sub, scissor);
|
||||||
|
|
||||||
|
if (m_t.m_cellViews.empty())
|
||||||
|
return;
|
||||||
|
|
||||||
|
float pf = rootView().viewRes().pixelFactor();
|
||||||
|
int div = sub.size[0] / m_t.m_cellViews.size();
|
||||||
|
boo::SWindowRect cell = sub;
|
||||||
|
cell.size[1] = ROW_HEIGHT * pf;
|
||||||
|
cell.location[1] += sub.size[1] - cell.size[1];
|
||||||
|
int spacing = (ROW_HEIGHT + ROW_SPACING) * pf;
|
||||||
|
int hStart = cell.location[1];
|
||||||
|
for (auto& col : m_t.m_cellViews)
|
||||||
|
{
|
||||||
|
cell.location[1] = hStart;
|
||||||
|
for (std::unique_ptr<CellView>& cv : col)
|
||||||
|
{
|
||||||
|
cell.location[1] -= spacing;
|
||||||
|
if (cv)
|
||||||
|
cv->resized(root, cell);
|
||||||
|
}
|
||||||
|
cell.location[0] += div;
|
||||||
|
}
|
||||||
|
|
||||||
|
m_scissorRect = scissor;
|
||||||
|
m_scissorRect.size[1] -= spacing;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Table::CellView::resized(const boo::SWindowRect& root, const boo::SWindowRect& sub)
|
void Table::CellView::resized(const boo::SWindowRect& root, const boo::SWindowRect& sub)
|
||||||
|
@ -230,21 +266,27 @@ void Table::draw(boo::IGraphicsCommandQueue* gfxQ)
|
||||||
|
|
||||||
void Table::RowsView::draw(boo::IGraphicsCommandQueue* gfxQ)
|
void Table::RowsView::draw(boo::IGraphicsCommandQueue* gfxQ)
|
||||||
{
|
{
|
||||||
gfxQ->setShaderDataBinding(m_t.m_shaderBinding);
|
gfxQ->setShaderDataBinding(m_shaderBinding);
|
||||||
gfxQ->setDrawPrimitive(boo::Primitive::TriStrips);
|
gfxQ->setDrawPrimitive(boo::Primitive::TriStrips);
|
||||||
gfxQ->setScissor(subRect());
|
|
||||||
size_t rows = std::min(m_t.m_visibleRows, m_t.m_rows);
|
gfxQ->setScissor(m_scissorRect);
|
||||||
|
size_t rows = std::min(m_visibleRows, m_t.m_rows);
|
||||||
gfxQ->draw(1, rows * 6 - 2);
|
gfxQ->draw(1, rows * 6 - 2);
|
||||||
|
for (auto& col : m_t.m_cellViews)
|
||||||
|
{
|
||||||
|
size_t idx = 0;
|
||||||
|
for (std::unique_ptr<CellView>& cv : col)
|
||||||
|
{
|
||||||
|
if (cv && idx >= m_visibleStart && idx < m_visibleStart + m_visibleRows)
|
||||||
|
cv->draw(gfxQ);
|
||||||
|
++idx;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
gfxQ->setScissor(rootView().subRect());
|
||||||
|
|
||||||
for (std::unique_ptr<CellView>& hv : m_t.m_headerViews)
|
for (std::unique_ptr<CellView>& hv : m_t.m_headerViews)
|
||||||
if (hv)
|
if (hv)
|
||||||
hv->draw(gfxQ);
|
hv->draw(gfxQ);
|
||||||
for (auto& col : m_t.m_cellViews)
|
|
||||||
{
|
|
||||||
for (std::unique_ptr<CellView>& cv : col)
|
|
||||||
if (cv)
|
|
||||||
cv->draw(gfxQ);
|
|
||||||
}
|
|
||||||
gfxQ->setScissor(rootView().subRect());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Table::CellView::draw(boo::IGraphicsCommandQueue* gfxQ)
|
void Table::CellView::draw(boo::IGraphicsCommandQueue* gfxQ)
|
||||||
|
|
Loading…
Reference in New Issue