forks
/
arsd
mirror of https://github.com/adamdruppe/arsd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #457 from analogjupiter/timer-conflict 

Timer conflict
This commit is contained in:
Adam D. Ruppe 2024-09-10 21:21:55 -04:00 committed by GitHub
parent 4f2b94e790 2e05986ade
commit 5dd6f2bc54
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core.d
View File

@ -3708,6 +3708,9 @@ package(arsd) __gshared CleanupQueue cleanupQueue;
slow could lock up the event loop. It now guarantees other things will slow could lock up the event loop. It now guarantees other things will
get a chance to run between timer calls, even if that means not keeping up get a chance to run between timer calls, even if that means not keeping up
with the requested interval. with the requested interval.
Originally part of arsd.simpledisplay, this code was integrated into
arsd.core on May 26, 2024 (committed on June 10).
+/ +/
version(HasTimer) version(HasTimer)
class Timer { class Timer {

7
pixmappresenter.d
View File

@ -192,7 +192,12 @@ alias Pixmap = arsd.pixmappaint.Pixmap;
alias WindowResizedCallback = void delegate(Size); alias WindowResizedCallback = void delegate(Size);
// is the Timer class available on this platform? // is the Timer class available on this platform?
private enum hasTimer = is(Timer == class); private enum hasTimer = is(arsd.simpledisplay.Timer == class);
// resolve symbol clash on “Timer” (arsd.core vs arsd.simpledisplay)
static if (hasTimer) {
private alias Timer = arsd.simpledisplay.Timer;
}
// viewport math // viewport math
private @safe pure nothrow @nogc { private @safe pure nothrow @nogc {