Merge main into branch

gyscos · May 29, 2024 · a1bf69c · a1bf69c
2 parents ea5912e + 3d7d6b7
commit a1bf69c
Show file tree

Hide file tree

Showing 60 changed files with 23 additions and 8 deletions.
diff --git a/Readme.md b/Readme.md
@@ -45,16 +45,16 @@ fn main() {
 }
 ```
 
-[![Cursive dialog example](https://raw.githubusercontent.com/gyscos/cursive/main/doc/cursive_example.png)](examples/dialog.rs)
+[![Cursive dialog example](https://raw.githubusercontent.com/gyscos/cursive/main/doc/cursive_example.png)](https://github.com/gyscos/cursive/tree/main/cursive/examples/dialog.rs)
 
-Check out the other [examples](https://github.com/gyscos/cursive/tree/main/examples) to get these results, and more:
+Check out the other [examples](https://github.com/gyscos/cursive/tree/main/cursive/examples) to get these results, and more:
 
 <div>
-<a href="https://github.com/gyscos/cursive/blob/main/examples/lorem.rs"><img src="https://imgur.com/hW9M9MV.png" alt="lorem.rs example", width="48%" /></a>
-<a href="https://github.com/gyscos/cursive/blob/main/examples/menubar.rs"><img src="https://imgur.com/xx3lZPz.png" alt="menubar.rs example", width="48%" /></a>
-<a href="https://github.com/gyscos/cursive/blob/main/examples/select.rs"><img src="https://imgur.com/couty0n.png" alt="select.rs example", width="48%" /></a>
-<a href="https://github.com/gyscos/cursive/blob/main/examples/mines/"><img src="https://imgur.com/vNteYyy.png" alt="mines example", width="48%" /></a>
-<a href="https://github.com/gyscos/cursive/blob/main/examples/theme_manual.rs"><img src="https://i.imgur.com/I9V5KRi.png" alt="theme_manual.rs example", width="48%" /></a>
+<a href="https://github.com/gyscos/cursive/blob/main/cursive/examples/lorem.rs"><img src="https://imgur.com/hW9M9MV.png" alt="lorem.rs example", width="48%" /></a>
+<a href="https://github.com/gyscos/cursive/blob/main/cursive/examples/menubar.rs"><img src="https://imgur.com/xx3lZPz.png" alt="menubar.rs example", width="48%" /></a>
+<a href="https://github.com/gyscos/cursive/blob/main/cursive/examples/select.rs"><img src="https://imgur.com/couty0n.png" alt="select.rs example", width="48%" /></a>
+<a href="https://github.com/gyscos/cursive/blob/main/cursive/examples/mines/"><img src="https://imgur.com/vNteYyy.png" alt="mines example", width="48%" /></a>
+<a href="https://github.com/gyscos/cursive/blob/main/cursive/examples/theme_manual.rs"><img src="https://i.imgur.com/I9V5KRi.png" alt="theme_manual.rs example", width="48%" /></a>
 <a href="https://github.com/gyscos/cursive/blob/main/cursive-syntect/examples/parse.rs"><img src="https://i.imgur.com/a8bfe5s.png" alt="syntect example" width="48%" /></a>
 </div>
 

diff --git a/cursive/examples b/cursive/examples
diff --git a/examples/Readme.md → cursive/examples/Readme.md b/examples/Readme.md → cursive/examples/Readme.md
diff --git a/examples/advanced_user_data.rs → cursive/examples/advanced_user_data.rs b/examples/advanced_user_data.rs → cursive/examples/advanced_user_data.rs
diff --git a/examples/ansi.rs → cursive/examples/ansi.rs b/examples/ansi.rs → cursive/examples/ansi.rs
diff --git a/examples/assets/cities.txt → cursive/examples/assets/cities.txt b/examples/assets/cities.txt → cursive/examples/assets/cities.txt
diff --git a/examples/assets/lorem.txt → cursive/examples/assets/lorem.txt b/examples/assets/lorem.txt → cursive/examples/assets/lorem.txt
diff --git a/examples/assets/style.toml → cursive/examples/assets/style.toml b/examples/assets/style.toml → cursive/examples/assets/style.toml
diff --git a/examples/autocomplete.rs → cursive/examples/autocomplete.rs b/examples/autocomplete.rs → cursive/examples/autocomplete.rs
diff --git a/examples/builder.rs → cursive/examples/builder.rs b/examples/builder.rs → cursive/examples/builder.rs
diff --git a/examples/builder.yaml → cursive/examples/builder.yaml b/examples/builder.yaml → cursive/examples/builder.yaml
diff --git a/examples/colors.rs → cursive/examples/colors.rs b/examples/colors.rs → cursive/examples/colors.rs
diff --git a/examples/ctrl_c.rs → cursive/examples/ctrl_c.rs b/examples/ctrl_c.rs → cursive/examples/ctrl_c.rs
diff --git a/examples/debug_console.rs → cursive/examples/debug_console.rs b/examples/debug_console.rs → cursive/examples/debug_console.rs
diff --git a/examples/dialog.rs → cursive/examples/dialog.rs b/examples/dialog.rs → cursive/examples/dialog.rs
diff --git a/examples/edit.rs → cursive/examples/edit.rs b/examples/edit.rs → cursive/examples/edit.rs
diff --git a/examples/fixed_layout.rs → cursive/examples/fixed_layout.rs b/examples/fixed_layout.rs → cursive/examples/fixed_layout.rs
diff --git a/examples/focus.rs → cursive/examples/focus.rs b/examples/focus.rs → cursive/examples/focus.rs
diff --git a/examples/hello_world.rs → cursive/examples/hello_world.rs b/examples/hello_world.rs → cursive/examples/hello_world.rs
diff --git a/cursive/examples/issue_768.rs b/cursive/examples/issue_768.rs
@@ -0,0 +1,15 @@
+use cursive;
+
+fn main() {
+ let mut v = cursive::views::SelectView::new()
+ .item_str("Foo")
+ .item_str("Bar");
+
+ let (label, content) = v.get_item_mut(1).unwrap();
+ *label = "foo".into();
+ *content = "foooo".into();
+
+ let mut siv = cursive::default();
+ siv.add_layer(v);
+ siv.run();
+}
diff --git a/examples/key_codes.rs → cursive/examples/key_codes.rs b/examples/key_codes.rs → cursive/examples/key_codes.rs
diff --git a/examples/label-view.yaml → cursive/examples/label-view.yaml b/examples/label-view.yaml → cursive/examples/label-view.yaml
diff --git a/examples/linear.rs → cursive/examples/linear.rs b/examples/linear.rs → cursive/examples/linear.rs
diff --git a/examples/list_view.rs → cursive/examples/list_view.rs b/examples/list_view.rs → cursive/examples/list_view.rs
diff --git a/examples/logs.rs → cursive/examples/logs.rs b/examples/logs.rs → cursive/examples/logs.rs
diff --git a/examples/lorem.rs → cursive/examples/lorem.rs b/examples/lorem.rs → cursive/examples/lorem.rs
diff --git a/examples/markup.rs → cursive/examples/markup.rs b/examples/markup.rs → cursive/examples/markup.rs
diff --git a/examples/menubar.rs → cursive/examples/menubar.rs b/examples/menubar.rs → cursive/examples/menubar.rs
diff --git a/examples/menubar_styles.rs → cursive/examples/menubar_styles.rs b/examples/menubar_styles.rs → cursive/examples/menubar_styles.rs
diff --git a/examples/mines/Readme.md → cursive/examples/mines/Readme.md b/examples/mines/Readme.md → cursive/examples/mines/Readme.md
diff --git a/examples/mines/game.rs → cursive/examples/mines/game.rs b/examples/mines/game.rs → cursive/examples/mines/game.rs
diff --git a/examples/mines/main.rs → cursive/examples/mines/main.rs b/examples/mines/main.rs → cursive/examples/mines/main.rs
diff --git a/examples/mutation.rs → cursive/examples/mutation.rs b/examples/mutation.rs → cursive/examples/mutation.rs
diff --git a/examples/panels.rs → cursive/examples/panels.rs b/examples/panels.rs → cursive/examples/panels.rs
diff --git a/examples/pause.rs → cursive/examples/pause.rs b/examples/pause.rs → cursive/examples/pause.rs
diff --git a/examples/position.rs → cursive/examples/position.rs b/examples/position.rs → cursive/examples/position.rs
diff --git a/examples/progress.rs → cursive/examples/progress.rs b/examples/progress.rs → cursive/examples/progress.rs
diff --git a/examples/radio.rs → cursive/examples/radio.rs b/examples/radio.rs → cursive/examples/radio.rs
diff --git a/examples/refcell_view.rs → cursive/examples/refcell_view.rs b/examples/refcell_view.rs → cursive/examples/refcell_view.rs
diff --git a/examples/scroll.rs → cursive/examples/scroll.rs b/examples/scroll.rs → cursive/examples/scroll.rs
diff --git a/examples/select.rs → cursive/examples/select.rs b/examples/select.rs → cursive/examples/select.rs
diff --git a/examples/select_test.rs → cursive/examples/select_test.rs b/examples/select_test.rs → cursive/examples/select_test.rs
diff --git a/examples/slider.rs → cursive/examples/slider.rs b/examples/slider.rs → cursive/examples/slider.rs
diff --git a/examples/status.rs → cursive/examples/status.rs b/examples/status.rs → cursive/examples/status.rs
diff --git a/examples/status_bar_ext.rs → cursive/examples/status_bar_ext.rs b/examples/status_bar_ext.rs → cursive/examples/status_bar_ext.rs
diff --git a/examples/stopwatch.rs → cursive/examples/stopwatch.rs b/examples/stopwatch.rs → cursive/examples/stopwatch.rs
diff --git a/examples/tcp_server.rs → cursive/examples/tcp_server.rs b/examples/tcp_server.rs → cursive/examples/tcp_server.rs
diff --git a/examples/terminal_default.rs → cursive/examples/terminal_default.rs b/examples/terminal_default.rs → cursive/examples/terminal_default.rs
diff --git a/examples/text_area.rs → cursive/examples/text_area.rs b/examples/text_area.rs → cursive/examples/text_area.rs
diff --git a/examples/text_with_ansi_codes.txt → cursive/examples/text_with_ansi_codes.txt b/examples/text_with_ansi_codes.txt → cursive/examples/text_with_ansi_codes.txt
diff --git a/examples/theme.rs → cursive/examples/theme.rs b/examples/theme.rs → cursive/examples/theme.rs
diff --git a/examples/theme_editor.rs → cursive/examples/theme_editor.rs b/examples/theme_editor.rs → cursive/examples/theme_editor.rs
diff --git a/examples/theme_manual.rs → cursive/examples/theme_manual.rs b/examples/theme_manual.rs → cursive/examples/theme_manual.rs
diff --git a/examples/themed_view.rs → cursive/examples/themed_view.rs b/examples/themed_view.rs → cursive/examples/themed_view.rs
diff --git a/examples/user_data.rs → cursive/examples/user_data.rs b/examples/user_data.rs → cursive/examples/user_data.rs
diff --git a/examples/view.yaml → cursive/examples/view.yaml b/examples/view.yaml → cursive/examples/view.yaml
diff --git a/examples/vpv.rs → cursive/examples/vpv.rs b/examples/vpv.rs → cursive/examples/vpv.rs
diff --git a/examples/vspace.yaml → cursive/examples/vspace.yaml b/examples/vspace.yaml → cursive/examples/vspace.yaml
diff --git a/examples/window_title.rs → cursive/examples/window_title.rs b/examples/window_title.rs → cursive/examples/window_title.rs
diff --git a/examples b/examples
@@ -0,0 +1 @@
+cursive/examples