ardour/livetrax
13
0
Fork 0
Code

catch pushing identical cursors to the cursor stack

Browse Source
This commit is contained in:
Paul Davis 2024-11-11 21:01:11 -07:00
parent b9b3e75b5c
commit bccf36d665
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gtk2_ardour/editing_context.cc
View File

@ -2036,6 +2036,7 @@ EditingContext::set_canvas_cursor (Gdk::Cursor* cursor)
For now, drop down and use C API For now, drop down and use C API
*/ */
gdk_window_set_cursor (win->gobj(), cursor ? cursor->gobj() : 0); gdk_window_set_cursor (win->gobj(), cursor ? cursor->gobj() : 0);
gdk_flush ();
} }
} }
@ -2043,6 +2044,12 @@ size_t
EditingContext::push_canvas_cursor (Gdk::Cursor* cursor) EditingContext::push_canvas_cursor (Gdk::Cursor* cursor)
{ {
if (!_cursors->is_invalid (cursor)) { if (!_cursors->is_invalid (cursor)) {
if (!_cursor_stack.empty()) {
if (cursor == _cursor_stack.back()) {
return _cursor_stack.size() - 1;
}
}
_cursor_stack.push_back (cursor); _cursor_stack.push_back (cursor);
set_canvas_cursor (cursor); set_canvas_cursor (cursor);
} }
@ -2059,7 +2066,7 @@ EditingContext::pop_canvas_cursor ()
} }
_cursor_stack.pop_back(); _cursor_stack.pop_back();
if (_cursor_stack.back()) { if (!_cursor_stack.empty()) {
/* Popped to an existing cursor, we're done. Otherwise, the /* Popped to an existing cursor, we're done. Otherwise, the
context that created this cursor has been destroyed, so we need context that created this cursor has been destroyed, so we need
to skip to the next down the stack. */ to skip to the next down the stack. */