New default marker

assets/textures/markers/triangles/marker.json

@@ -0,0 +1,41 @@
+{
+    "name": "triangles",
+    "size": 600,
+    "fps": 60,
+    "approach": {
+        "sprite_sheet": "approach.png",
+        "count": 32,
+        "columns": 4,
+        "rows": 8
+    },
+    "miss": {
+        "sprite_sheet": "miss.png",
+        "count": 16,
+        "columns": 4,
+        "rows": 4
+    },
+    "poor": {
+        "sprite_sheet": "poor.png",
+        "count": 32,
+        "columns": 4,
+        "rows": 8
+    },
+    "good": {
+        "sprite_sheet": "good.png",
+        "count": 32,
+        "columns": 4,
+        "rows": 8
+    },
+    "great": {
+        "sprite_sheet": "great.png",
+        "count": 32,
+        "columns": 4,
+        "rows": 8
+    },
+    "perfect": {
+        "sprite_sheet": "perfect.png",
+        "count": 32,
+        "columns": 4,
+        "rows": 8
+    }
+}

docs/Marker Format.md

@@ -6,7 +6,9 @@ one directory = one marker
 
 let's call that directory `folder/`
 
-`folder/preview.png` will be used as preview if present
+The first existing + valid image in this list is used as a preview icon : 
+- `folder/preview.png`
+- `folder/ma15.png`
 
 ## Old Format
 
@@ -71,6 +73,7 @@ Markers in the old format run at 30 fps.
 
 | Key | Meaning |
 |-|-|
+| `name` | self-explanatory |
 | `size` | side length of each frame, in pixels |
 | `fps` | number of frames per seconds of this marker |
 | `*.count` | how many frames are used in a given sprite sheet |
@@ -86,8 +89,10 @@ Sprites in a sheet are ordrered left to right, top to bottom :
 7 8 9
 ```
 
-`count` can be <= `columns` * `rows`. It means the last few frames in
+`count` can be less than `columns` * `rows`. It means the last few frames in
-the sheet are unused. For instance in a 3 * 3 sprite sheet with `count` = 7 :
+the sheet are unused.
+
+For instance in a 3 * 3 sprite sheet with `count` = 7 :
 
 ```none
 1 2 3  

src/main.cpp

@@ -765,6 +765,9 @@ int main() {
                 }
                 if (ImGui::BeginMenu("Marker")) {
                     int i = 0;
+                    const auto& style = ImGui::GetStyle();
+                    const auto size_x = 100 + style.FramePadding.x * 2;
+                    const auto size_y = 100 + style.FramePadding.y * 2;
                     std::for_each(
                         markers.cbegin(),
                         markers.cend(),
@@ -775,7 +778,7 @@ int main() {
                             if (opt_preview) {
                                 clicked = ImGui::ImageButton(*opt_preview, {100, 100});
                             } else {
-                                clicked = ImGui::Button(path_to_utf8_encoded_string(path).c_str(), {100, 100});
+                                clicked = ImGui::Button(path_to_utf8_encoded_string(path).c_str(), {size_x, size_y});
                             }
                             if (clicked) {
                                 markers.load_marker(path);