summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin R. Miller <incanus@codesorcery.net>2015-11-17 11:36:35 -0800
committerJustin R. Miller <incanus@codesorcery.net>2015-11-17 12:00:51 -0800
commitac10cc1ecd174c9353ef26bab2c97a4d0696d78c (patch)
treef50b570a3256fcf3c72431845bb934567842214d
parent85ab48636c0f0cb5b1ec5c5b6b64a41dbd188e06 (diff)
downloadqtlocation-mapboxgl-ac10cc1ecd174c9353ef26bab2c97a4d0696d78c.tar.gz
fixes #3054: move desktop test app keybindings output to startup log
-rw-r--r--docs/DEVELOP_LINUX.md8
-rw-r--r--docs/DEVELOP_OSX.md8
-rw-r--r--platform/default/glfw_view.cpp25
3 files changed, 27 insertions, 14 deletions
diff --git a/docs/DEVELOP_LINUX.md b/docs/DEVELOP_LINUX.md
index 57f5592cd4..5b48393d6b 100644
--- a/docs/DEVELOP_LINUX.md
+++ b/docs/DEVELOP_LINUX.md
@@ -49,10 +49,4 @@ The `zsh` will treat the * in this command as a glob, so you'll need to run
### Usage
-- Press `S` to cycle through bundled styles
-- Press `X` to reset the transform
-- Press `N` to reset north
-- Press `Tab` to toggle debug information
-- Press `C` to toggle symbol collision debug boxes
-- Press `Esc` to quit
-- Press `1` through `6` to add increasing numbers of point annotations for testing
+Keyboard shortcuts for testing functionality are logged to the console when the test app is started.
diff --git a/docs/DEVELOP_OSX.md b/docs/DEVELOP_OSX.md
index ee6977682b..ed9142b092 100644
--- a/docs/DEVELOP_OSX.md
+++ b/docs/DEVELOP_OSX.md
@@ -20,10 +20,4 @@ Set up the access token by editing the scheme for the application target, then a
### Usage
-- Press `S` to cycle through bundled styles
-- Press `X` to reset the transform
-- Press `N` to reset north
-- Press `Tab` to toggle debug information
-- Press `C` to toggle symbol collision debug boxes
-- Press `Esc` to quit
-- Press `1` through `6` to add increasing numbers of point annotations for testing
+Keyboard shortcuts for testing functionality are logged to the console when the test app is started.
diff --git a/platform/default/glfw_view.cpp b/platform/default/glfw_view.cpp
index c8df32c375..eae2c3610a 100644
--- a/platform/default/glfw_view.cpp
+++ b/platform/default/glfw_view.cpp
@@ -82,6 +82,31 @@ GLFWView::GLFWView(bool fullscreen_, bool benchmark_)
pixelRatio = static_cast<float>(fbWidth) / width;
glfwMakeContextCurrent(nullptr);
+
+ printf("\n");
+ printf("================================================================================\n");
+ printf("\n");
+ printf("- Press `S` to cycle through bundled styles\n");
+ printf("- Press `X` to reset the transform\n");
+ printf("- Press `N` to reset north\n");
+ printf("- Press `C` to toggle symbol collision debug boxes\n");
+ printf("- Press `R` to toggle any available `night` style class\n");
+ printf("\n");
+ printf("- Press `1` through `6` to add increasing numbers of point annotations for testing\n");
+ printf("- Press `7` through `0` to add increasing numbers of shape annotations for testing\n");
+ printf("\n");
+ printf("- Press `Q` to remove annotations\n");
+ printf("- Press `P` to add a random custom runtime imagery annotation\n");
+ printf("- Press `W` to pop the last-added annotation off\n");
+ printf("\n");
+ printf("- `Control` + mouse drag to rotate\n");
+ printf("- `Shift` + mouse drag to tilt\n");
+ printf("\n");
+ printf("- Press `Tab` to toggle debug information\n");
+ printf("- Press `Esc` to quit\n");
+ printf("\n");
+ printf("================================================================================\n");
+ printf("\n");
}
GLFWView::~GLFWView() {