ch0ic3/cutter
1
0
Fork 0
mirror of https://github.com/rizinorg/cutter.git synced 2025-02-01 09:07:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix VisualNavbar Crash on Haiku

Browse Source
This commit is contained in:
Florian Märkl 2021-11-15 15:36:55 +01:00
parent c07ce55581
commit bd4342c4cb
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/widgets/VisualNavbar.cpp
View File

@ -25,6 +25,8 @@ VisualNavbar::VisualNavbar(MainWindow *main, QWidget *parent)
{ {
Q_UNUSED(parent); Q_UNUSED(parent);
blockTooltip = false;
setObjectName("visualNavbar"); setObjectName("visualNavbar");
setWindowTitle(tr("Visual navigation bar")); setWindowTitle(tr("Visual navigation bar"));
// setMovable(false); // setMovable(false);
@ -240,11 +242,17 @@ void VisualNavbar::on_seekChanged(RVA addr)
void VisualNavbar::mousePressEvent(QMouseEvent *event) void VisualNavbar::mousePressEvent(QMouseEvent *event)
{ {
if (blockTooltip) {
return;
}
qreal x = qhelpers::mouseEventPos(event).x(); qreal x = qhelpers::mouseEventPos(event).x();
RVA address = localXToAddress(x); RVA address = localXToAddress(x);
if (address != RVA_INVALID) { if (address != RVA_INVALID) {
auto tooltipPos = qhelpers::mouseEventGlobalPos(event); auto tooltipPos = qhelpers::mouseEventGlobalPos(event);
blockTooltip = true; // on Haiku, the below call sometimes triggers another mouseMoveEvent,
// causing infinite recursion
QToolTip::showText(tooltipPos, toolTipForAddress(address), this, this->rect()); QToolTip::showText(tooltipPos, toolTipForAddress(address), this, this->rect());
blockTooltip = false;
if (event->buttons() & Qt::LeftButton) { if (event->buttons() & Qt::LeftButton) {
event->accept(); event->accept();
Core()->seek(address); Core()->seek(address);

1
src/widgets/VisualNavbar.h
View File

@ -48,6 +48,7 @@ private:
unsigned int previousWidth = 0; unsigned int previousWidth = 0;
QList<XToAddress> xToAddress; QList<XToAddress> xToAddress;
bool blockTooltip;
RVA localXToAddress(double x); RVA localXToAddress(double x);
double addressToLocalX(RVA address); double addressToLocalX(RVA address);