whitespace

Cargo.toml

@@ -8,10 +8,8 @@ edition = "2018"
 crate_type = "bin"
 
 [dependencies]
-clipboard = "^0.5.0"
 dirs = "^3.0.1"
-glium = "^0.27.0"
+gio = "^0"
-imgui = "^0.5.0"
+gtk = "^0"
-imgui-glium-renderer = "^0.5.0"
-imgui-winit-support = "^0.5.0"
 rodio = "^0.11.0"
+iui = "0.3"

src/main.rs

@@ -1,16 +1,21 @@
 #![windows_subsystem = "windows"]
 
+use gio::prelude::*;
+use gtk::prelude::*;
+use gtk::Orientation;
 use rodio::{Sink, Source};
 use std::env::args;
 use std::fs::File;
 use std::io::BufReader;
 use std::path::PathBuf;
 use std::process::Command;
-use imgui::*;
 
-mod support;
+use iui::prelude::*;
-
+use iui::controls::{Label, Spinbox, Slider, Entry, MultilineEntry, VerticalBox, HorizontalBox, HorizontalSeparator, Group, Spacer};
-const SPACING: i32 = 16;
+use std::rc::Rc;
+use std::cell::RefCell;
+//
+// const SPACING: i32 = 16;
 //
 // fn error_popup(message: &str) {
 //     let popup = gtk::Window::new(gtk::WindowType::Toplevel);
@@ -146,22 +151,127 @@ fn get_data_dir() -> PathBuf {
 //     window.show_all();
 // }
 
-fn main() {
+/// This struct will hold the values that multiple callbacks will need to access.
-    let system = support::init(file!());
+struct State {
-
+    slider_val: i64,
-    system.main_loop(move |_, ui| {
+    spinner_val: i64,
-        Window::new(im_str!("Hello world"))
+    entry_val: String,
-            .size([300.0, 100.0], Condition::FirstUseEver)
+    multi_val: String,
-            .build(&ui, || {
+}
-                ui.text(im_str!("Hello world!"));
+
-                ui.text(im_str!("こんにちは世界！"));
+fn main() {
-                ui.text(im_str!("This...is...imgui-rs!"));
+    // Initialize the UI framework.
-                ui.separator();
+    let ui = UI::init().unwrap();
-                let mouse_pos = ui.io().mouse_pos;
+
-                ui.text(format!(
+    // Initialize the state of the application.
-                    "Mouse Position: ({:.1},{:.1})",
+    let state = Rc::new(RefCell::new(
-                    mouse_pos[0], mouse_pos[1]
+        State { slider_val: 0, spinner_val: 0, entry_val: "".into(), multi_val: "".into() }
-                ));
+    ));
-            });
+
-    });
+    // Set up the inputs for the application.
+    // While it's not necessary to create a block for this, it makes the code a lot easier
+    // to read; the indentation presents a visual cue informing the reader that these
+    // statements are related.
+    let (input_group, mut slider, mut spinner, mut entry, mut multi) = {
+        // The group will hold all the inputs
+        let mut input_group = Group::new(&ui, "Inputs");
+
+        // The vertical box arranges the inputs within the groups
+        let mut input_vbox = VerticalBox::new(&ui);
+        input_vbox.set_padded(&ui, true);
+
+        // Numerical inputs
+        let slider = Slider::new(&ui, 1, 100);
+        let spinner = Spinbox::new(&ui, 1, 100);
+        let entry = Entry::new(&ui);
+        let multi = MultilineEntry::new(&ui);
+
+        // Add everything in hierarchy
+        // Note the reverse order here. Again, it's not necessary, but it improves
+        // readability.
+        input_vbox.append(&ui, slider.clone(), LayoutStrategy::Compact);
+        input_vbox.append(&ui, spinner.clone(), LayoutStrategy::Compact);
+        input_vbox.append(&ui, Spacer::new(&ui), LayoutStrategy::Compact);
+        input_vbox.append(&ui, HorizontalSeparator::new(&ui), LayoutStrategy::Compact);
+        input_vbox.append(&ui, Spacer::new(&ui), LayoutStrategy::Compact);
+        input_vbox.append(&ui, entry.clone(), LayoutStrategy::Compact);
+        input_vbox.append(&ui, multi.clone(), LayoutStrategy::Stretchy);
+        input_group.set_child(&ui, input_vbox);
+
+        (input_group, slider, spinner, entry, multi)
+    };
+
+    // Set up the outputs for the application. Organization is very similar to the
+    // previous setup.
+    let (output_group, add_label, sub_label, text_label, bigtext_label) = {
+        let mut output_group = Group::new(&ui, "Outputs");
+        let mut output_vbox = VerticalBox::new(&ui);
+        let add_label = Label::new(&ui, "");
+        let sub_label = Label::new(&ui, "");
+        let text_label = Label::new(&ui, "");
+        let bigtext_label = Label::new(&ui, "");
+        output_vbox.append(&ui, add_label.clone(), LayoutStrategy::Compact);
+        output_vbox.append(&ui, sub_label.clone(), LayoutStrategy::Compact);
+        output_vbox.append(&ui, text_label.clone(), LayoutStrategy::Compact);
+        output_vbox.append(&ui, bigtext_label.clone(), LayoutStrategy::Stretchy);
+        output_group.set_child(&ui, output_vbox);
+
+        (output_group, add_label, sub_label, text_label, bigtext_label)
+    };
+
+    // This horizontal box will arrange the two groups of controls.
+    let mut hbox = HorizontalBox::new(&ui);
+    hbox.append(&ui, input_group, LayoutStrategy::Stretchy);
+    hbox.append(&ui, output_group, LayoutStrategy::Stretchy);
+
+    // The window allows all constituent components to be displayed.
+    let mut window = Window::new(&ui, "Input Output Test", 300, 150, WindowType::NoMenubar);
+    window.set_child(&ui, hbox);
+    window.show(&ui);
+
+    // These on_changed functions allow updating the application state when a
+    // control changes its value.
+
+    slider.on_changed(&ui, {
+        let state = state.clone();
+        move |val| { state.borrow_mut().slider_val = val; }
+    });
+
+    spinner.on_changed(&ui, {
+        let state = state.clone();
+        move |val| { state.borrow_mut().spinner_val = val; }
+    });
+
+    entry.on_changed(&ui, {
+        let state = state.clone();
+        move |val| { state.borrow_mut().entry_val = val; }
+    });
+
+    multi.on_changed(&ui, {
+        let state = state.clone();
+        move |val| { state.borrow_mut().multi_val = val; }
+    });
+
+
+    // Rather than just invoking ui.run(), using EventLoop gives a lot more control
+    // over the user interface event loop.
+    // Here, the on_tick() callback is used to update the view against the state.
+    let mut event_loop = ui.event_loop();
+    event_loop.on_tick(&ui, {
+        let ui = ui.clone();
+        let mut add_label = add_label.clone();
+        let mut sub_label = sub_label.clone();
+        let mut text_label = text_label.clone();
+        let mut bigtext_label = bigtext_label.clone();
+        move || {
+            let state = state.borrow();
+
+            // Update all the labels
+            add_label.set_text(&ui, &format!("Added: {}", state.slider_val + state.spinner_val));
+            sub_label.set_text(&ui, &format!("Subtracted: {}", state.slider_val - state.spinner_val));
+            text_label.set_text(&ui, &format!("Text: {}", state.entry_val));
+            bigtext_label.set_text(&ui, &format!("Multiline Text: {}", state.multi_val));
+        }
+    });
+    event_loop.run(&ui);
 }

src/support/clipboard.rs

@@ -1,19 +0,0 @@
-use clipboard::{ClipboardContext, ClipboardProvider};
-use imgui::{ClipboardBackend, ImStr, ImString};
-
-pub struct ClipboardSupport(ClipboardContext);
-
-pub fn init() -> Option<ClipboardSupport> {
-    ClipboardContext::new()
-        .ok()
-        .map(|ctx| ClipboardSupport(ctx))
-}
-
-impl ClipboardBackend for ClipboardSupport {
-    fn get(&mut self) -> Option<ImString> {
-        self.0.get_contents().ok().map(|text| text.into())
-    }
-    fn set(&mut self, text: &ImStr) {
-        let _ = self.0.set_contents(text.to_str().to_owned());
-    }
-}

src/support/mod.rs

@@ -1,140 +0,0 @@
-use glium::glutin;
-use glium::glutin::event::{Event, WindowEvent};
-use glium::glutin::event_loop::{ControlFlow, EventLoop};
-use glium::glutin::window::WindowBuilder;
-use glium::{Display, Surface};
-use imgui::{Context, FontConfig, FontGlyphRanges, FontSource, Ui};
-use imgui_glium_renderer::Renderer;
-use imgui_winit_support::{HiDpiMode, WinitPlatform};
-use std::time::Instant;
-
-mod clipboard;
-
-pub struct System {
-    pub event_loop: EventLoop<()>,
-    pub display: glium::Display,
-    pub imgui: Context,
-    pub platform: WinitPlatform,
-    pub renderer: Renderer,
-    pub font_size: f32,
-}
-
-pub fn init(title: &str) -> System {
-    let title = match title.rfind('/') {
-        Some(idx) => title.split_at(idx + 1).1,
-        None => title,
-    };
-    let event_loop = EventLoop::new();
-    let context = glutin::ContextBuilder::new().with_vsync(true);
-    let builder = WindowBuilder::new()
-        .with_title(title.to_owned())
-        .with_inner_size(glutin::dpi::LogicalSize::new(1024f64, 768f64));
-    let display =
-        Display::new(builder, context, &event_loop).expect("Failed to initialize display");
-
-    let mut imgui = Context::create();
-    imgui.set_ini_filename(None);
-
-    if let Some(backend) = clipboard::init() {
-        imgui.set_clipboard_backend(Box::new(backend));
-    } else {
-        eprintln!("Failed to initialize clipboard");
-    }
-
-    let mut platform = WinitPlatform::init(&mut imgui);
-    {
-        let gl_window = display.gl_window();
-        let window = gl_window.window();
-        platform.attach_window(imgui.io_mut(), &window, HiDpiMode::Rounded);
-    }
-
-    let hidpi_factor = platform.hidpi_factor();
-    let font_size = (13.0 * hidpi_factor) as f32;
-    imgui.fonts().add_font(&[
-        FontSource::DefaultFontData {
-            config: Some(FontConfig {
-                size_pixels: font_size,
-                ..FontConfig::default()
-            }),
-        },
-        FontSource::TtfData {
-            data: include_bytes!("helsinki.ttf"),
-            size_pixels: font_size,
-            config: Some(FontConfig {
-                rasterizer_multiply: 1.75,
-                glyph_ranges: FontGlyphRanges::japanese(),
-                ..FontConfig::default()
-            }),
-        },
-    ]);
-
-    imgui.io_mut().font_global_scale = (1.0 / hidpi_factor) as f32;
-
-    let renderer = Renderer::init(&mut imgui, &display)
-        .expect("Failed to initialize renderer");
-
-    System {
-        event_loop,
-        display,
-        imgui,
-        platform,
-        renderer,
-        font_size,
-    }
-}
-
-impl System {
-    pub fn main_loop<F: FnMut(&mut bool, &mut Ui) + 'static>(self, mut run_ui: F) {
-        let System {
-            event_loop,
-            display,
-            mut imgui,
-            mut platform,
-            mut renderer,
-            ..
-        } = self;
-        let mut last_frame = Instant::now();
-
-        event_loop.run(move |event, _, control_flow| match event {
-            Event::NewEvents(_) => {
-                let now = Instant::now();
-                imgui.io_mut().update_delta_time(now - last_frame);
-                last_frame = now;
-            }
-            Event::MainEventsCleared => {
-                let gl_window = display.gl_window();
-                platform
-                    .prepare_frame(imgui.io_mut(), &gl_window.window())
-                    .expect("Failed to prepare frame");
-                gl_window.window().request_redraw();
-            }
-            Event::RedrawRequested(_) => {
-                let mut ui = imgui.frame();
-
-                let mut run = true;
-                run_ui(&mut run, &mut ui);
-                if !run {
-                    *control_flow = ControlFlow::Exit;
-                }
-
-                let gl_window = display.gl_window();
-                let mut target = display.draw();
-                target.clear_color_srgb(1.0, 1.0, 1.0, 1.0);
-                platform.prepare_render(&ui, gl_window.window());
-                let draw_data = ui.render();
-                renderer
-                    .render(&mut target, draw_data)
-                    .expect("Rendering failed");
-                target.finish().expect("Failed to swap buffers");
-            }
-            Event::WindowEvent {
-                event: WindowEvent::CloseRequested,
-                ..
-            } => *control_flow = ControlFlow::Exit,
-            event => {
-                let gl_window = display.gl_window();
-                platform.handle_event(imgui.io_mut(), gl_window.window(), &event);
-            }
-        })
-    }
-}