Mostly bugfixes

Author: markusmoenig

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "theframework"
-version = "0.1.15"
+version = "0.1.16"
 edition = "2021"
 description = "A cross platform application UI framework."
 license = "MIT"

Readme.md

@@ -4,7 +4,7 @@ Without any enabled options, TheFramework opens a window and provides a pixel bu
 
 ![UI Screenshot](images/screenshot_uidemo.png)
 
-![UI Screenshot](images/screenshot_ui.png)
+![UI Screenshot](images/screenshot_eldiron.png)
 
 ### Option: ui
 
@@ -24,8 +24,6 @@ I use TheFramework with the UI option for my own apps and games, notably [Eldiro
 
 A dedicated demo and documentation website will come soon.
 
-![UI Screenshot](images/screenshot_codegrid.png)
-
 ### Option: code
 
 The **code** option adds a unique and powerful visual scripting system to TheFramework.

images/screenshot_codegrid.png

@@ -556,6 +556,14 @@ impl TheUI {
         None
     }
 
+    /// Gets a given group button by name
+    pub fn get_group_button(&mut self, name: &str) -> Option<&mut dyn TheGroupButtonTrait> {
+        if let Some(text) = self.canvas.get_widget(Some(&name.to_string()), None) {
+            return text.as_group_button();
+        }
+        None
+    }
+
     /// Gets a given statusbar by name
     pub fn get_statusbar(&mut self, name: &str) -> Option<&mut dyn TheStatusbarTrait> {
         if let Some(text) = self.canvas.get_widget(Some(&name.to_string()), None) {

images/screenshot_eldiron.png

@@ -374,24 +374,30 @@ impl TheRGBALayoutTrait for TheRGBALayout {
     }
 
     fn scroll_to(&mut self, coord: Vec2i) {
-        if let Some(scroll_bar) = self.vertical_scrollbar.as_vertical_scrollbar() {
-            scroll_bar.scroll_to(coord.y);
-        }
+        if let Some(rgba) = self.rgba_view.as_rgba_view() {
+            let zoom = rgba.zoom();
 
-        if let Some(scroll_bar) = self.horizontal_scrollbar.as_horizontal_scrollbar() {
-            scroll_bar.scroll_to(coord.x);
+            if let Some(scroll_bar) = self.vertical_scrollbar.as_vertical_scrollbar() {
+                scroll_bar.scroll_to(((coord.y as f32) * zoom) as i32);
+            }
+
+            if let Some(scroll_bar) = self.horizontal_scrollbar.as_horizontal_scrollbar() {
+                scroll_bar.scroll_to(((coord.x as f32) * zoom) as i32);
+            }
         }
     }
 
     fn scroll_to_grid(&mut self, coord: Vec2i) {
         if let Some(rgba) = self.rgba_view.as_rgba_view() {
+            let zoom = rgba.zoom();
+
             if let Some(grid) = rgba.grid() {
                 if let Some(scroll_bar) = self.vertical_scrollbar.as_vertical_scrollbar() {
-                    scroll_bar.scroll_to(coord.y * grid);
+                    scroll_bar.scroll_to(((coord.y * grid) as f32 * zoom) as i32);
                 }
 
                 if let Some(scroll_bar) = self.horizontal_scrollbar.as_horizontal_scrollbar() {
-                    scroll_bar.scroll_to(coord.x * grid);
+                    scroll_bar.scroll_to(((coord.x * grid) as f32 * zoom) as i32);
                 }
             }
         }

images/screenshot_ui.png

@@ -590,7 +590,7 @@ impl TheWidget for TheCodeView {
                                     );
                                     ctx.draw.text_rect_blend(
                                         self.buffer.pixels_mut(),
-                                        &rect,
+                                        &(rect.0 + 4, rect.1, rect.2 - 8, rect.3),
                                         stride,
                                         font,
                                         font_size,
@@ -600,10 +600,23 @@ impl TheWidget for TheCodeView {
                                         TheVerticalAlign::Center,
                                     );
                                 }
+                                TheCodeAtom::ExternalCall(_,_) => {
+                                    ctx.draw.text_rect_blend(
+                                        self.buffer.pixels_mut(),
+                                        &(rect.0 + 2, rect.1, rect.2 - 4, rect.3),
+                                        stride,
+                                        font,
+                                        font_size,
+                                        &atom.describe(),
+                                        &text_color,
+                                        TheHorizontalAlign::Center,
+                                        TheVerticalAlign::Center,
+                                    );
+                                }
                                 _ => {
                                     ctx.draw.text_rect_blend(
                                         self.buffer.pixels_mut(),
-                                        &rect,
+                                        &(rect.0 + 4, rect.1, rect.2 - 8, rect.3),
                                         stride,
                                         font,
                                         font_size,

src/theui/mod.rs

@@ -314,10 +314,16 @@ impl TheWidget for TheGroupButton {
 }
 
 pub trait TheGroupButtonTrait {
+    /// Add a new text based item.
     fn add_text(&mut self, text: String);
+    /// Add a new text based item with an associated status text.
     fn add_text_status(&mut self, text: String, status: String);
+    /// Add a new text based item with an associated status text and an icon.
     fn add_text_status_icon(&mut self, text: String, status: String, icon: String);
+    /// Set the width of each itme.
     fn set_item_width(&mut self, width: usize);
+    /// Set the selected index.
+    fn set_selected_index(&mut self, index: i32);
 }
 
 impl TheGroupButtonTrait for TheGroupButton {
@@ -339,4 +345,8 @@ impl TheGroupButtonTrait for TheGroupButton {
     fn set_item_width(&mut self, width: usize) {
         self.item_width = width;
     }
+    fn set_selected_index(&mut self, index: i32) {
+        self.selected_index = Some(index as usize);
+        self.is_dirty = true;
+    }
 }

src/theui/thelayout/thergbalayout.rs

@@ -172,6 +172,7 @@ impl TheWidget for TheRGBAView {
                                     self.id.clone(),
                                     vec2i(loc.0, loc.1),
                                 ));
+                                self.hover = Some((loc.0, loc.1));
                             }
                         }
                     }