From 5f6c0ddf3e96603c9e89569b62b4e738f36b1add Mon Sep 17 00:00:00 2001 From: Vadim Lopatin Date: Wed, 18 May 2016 15:31:43 +0300 Subject: [PATCH] fix #264 -- system defined doubleclick time --- src/dlangui/core/events.d | 4 +++- src/dlangui/graphics/resources.d | 4 ++-- src/dlangui/platforms/common/startup.d | 2 ++ src/dlangui/platforms/sdl/sdlapp.d | 4 ++++ src/dlangui/platforms/windows/winapp.d | 1 + 5 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/dlangui/core/events.d b/src/dlangui/core/events.d index 614b1981..96524632 100644 --- a/src/dlangui/core/events.d +++ b/src/dlangui/core/events.d @@ -717,6 +717,9 @@ ushort mouseButtonToFlag(MouseButton btn) { } } +/// double click max interval, milliseconds; may be changed by platform +__gshared long DOUBLE_CLICK_THRESHOLD_MS = 300; + /// Mouse button state details for MouseEvent struct ButtonDetails { /// Clock.currStdTime() for down event of this button (0 if button is up). @@ -737,7 +740,6 @@ struct ButtonDetails { return _doubleClick; } - static long DOUBLE_CLICK_THRESHOLD_MS = 200; void reset() { diff --git a/src/dlangui/graphics/resources.d b/src/dlangui/graphics/resources.d index 990b74d1..fe70bf55 100644 --- a/src/dlangui/graphics/resources.d +++ b/src/dlangui/graphics/resources.d @@ -162,9 +162,9 @@ struct EmbeddedResourceList { __gshared EmbeddedResourceList embeddedResourceList; -// immutable string test_res = import("res/background.xml"); +//immutable string test_res = import("res/background.xml"); // Unfortunately, import with full pathes does not work on Windows -// version = USE_FULL_PATH_FOR_RESOURCES; +//version = USE_FULL_PATH_FOR_RESOURCES; EmbeddedResource[] embedResource(string resourceName)() { version (USE_FULL_PATH_FOR_RESOURCES) { diff --git a/src/dlangui/platforms/common/startup.d b/src/dlangui/platforms/common/startup.d index 122a40ff..adc97511 100644 --- a/src/dlangui/platforms/common/startup.d +++ b/src/dlangui/platforms/common/startup.d @@ -395,3 +395,5 @@ version(unittest) { } } } + + diff --git a/src/dlangui/platforms/sdl/sdlapp.d b/src/dlangui/platforms/sdl/sdlapp.d index 8ede15e9..87f7ace1 100644 --- a/src/dlangui/platforms/sdl/sdlapp.d +++ b/src/dlangui/platforms/sdl/sdlapp.d @@ -1723,6 +1723,10 @@ int sdlmain(string[] args) { } initResourceManagers(); + version (Windows) { + DOUBLE_CLICK_THRESHOLD_MS = GetDoubleClickTime(); + } + currentTheme = createDefaultTheme(); try { diff --git a/src/dlangui/platforms/windows/winapp.d b/src/dlangui/platforms/windows/winapp.d index 8177302a..e69bbad2 100644 --- a/src/dlangui/platforms/windows/winapp.d +++ b/src/dlangui/platforms/windows/winapp.d @@ -1126,6 +1126,7 @@ int myWinMain(void* hInstance, void* hPrevInstance, char* lpCmdLine, int iCmdSho } Platform.setInstance(w32platform); + DOUBLE_CLICK_THRESHOLD_MS = GetDoubleClickTime(); Log.v("Initializing font manager"); if (!initFontManager()) {