mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-01-07 09:56:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into beta

Browse Source
This commit is contained in:
David Capello 2021-10-25 17:47:23 -03:00
commit c4f2bf79a0
1 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/app/commands/debugger.cpp
View File

@ -170,6 +170,25 @@ public:
protected:
bool onProcessMessage(Message* msg) override {
switch (msg->type()) {
case kMouseWheelMessage: {
View* view = View::getView(this);
if (view) {
auto mouseMsg = static_cast<MouseMessage*>(msg);
gfx::Point scroll = view->viewScroll();
if (mouseMsg->preciseWheel())
scroll += mouseMsg->wheelDelta();
else
scroll += mouseMsg->wheelDelta() * textHeight()*3;
view->setViewScroll(scroll);
}
break;
}
}
return Widget::onProcessMessage(msg);
}
@ -189,17 +208,11 @@ protected:
vp = clientBounds();
auto f = font();
gfx::Rect linesVp(
vp.x, vp.y,
Graphics::measureUITextLength(base::convert_to<std::string>(nlines), f)
+ 4*guiscale(), // TODO configurable from the theme?
vp.h);
vp.x += linesVp.w;
vp.w -= linesVp.w;
gfx::Rect linesVp(0, vp.y, getLineNumberColumnWidth(), vp.h);
// Fill background
g->fillRect(linesBg, linesVp);
g->fillRect(bg, vp);
g->fillRect(linesBg, linesVp);
if (m_fileContent) {
auto icon = theme->parts.debugContinue()->bitmap(0);
@ -240,12 +253,22 @@ protected:
m_maxLineWidth = std::max(m_maxLineWidth, Graphics::measureUITextLength(tmp, f));
}
}
ev.setSizeHint(gfx::Size(m_maxLineWidth,
ev.setSizeHint(gfx::Size(m_maxLineWidth + getLineNumberColumnWidth(),
m_fileContent->lines.size() * textHeight()));
}
}
private:
int getLineNumberColumnWidth() const {
auto f = font();
int nlines = (m_fileContent ? m_fileContent->lines.size(): 0);
return
Graphics::measureUITextLength(base::convert_to<std::string>(nlines), f)
+ 4*guiscale(); // TODO configurable from the theme?
}
FileContentPtr m_fileContent;
int m_currentLine = -1;
int m_maxLineWidth = 0;