summaryrefslogtreecommitdiffstats
path: root/examples/integration_opengl
diff options
context:
space:
mode:
Diffstat (limited to 'examples/integration_opengl')
-rw-r--r--examples/integration_opengl/src/controls.rs17
-rw-r--r--examples/integration_opengl/src/main.rs12
2 files changed, 15 insertions, 14 deletions
diff --git a/examples/integration_opengl/src/controls.rs b/examples/integration_opengl/src/controls.rs
index f387b4e5..076d37d3 100644
--- a/examples/integration_opengl/src/controls.rs
+++ b/examples/integration_opengl/src/controls.rs
@@ -1,11 +1,10 @@
use iced_glow::Renderer;
-use iced_glutin::widget::slider::{self, Slider};
+use iced_glutin::widget::Slider;
use iced_glutin::widget::{Column, Row, Text};
use iced_glutin::{Alignment, Color, Command, Element, Length, Program};
pub struct Controls {
background_color: Color,
- sliders: [slider::State; 3],
}
#[derive(Debug, Clone)]
@@ -17,7 +16,6 @@ impl Controls {
pub fn new() -> Controls {
Controls {
background_color: Color::BLACK,
- sliders: Default::default(),
}
}
@@ -40,15 +38,14 @@ impl Program for Controls {
Command::none()
}
- fn view(&mut self) -> Element<Message, Renderer> {
- let [r, g, b] = &mut self.sliders;
+ fn view(&self) -> Element<Message, Renderer> {
let background_color = self.background_color;
let sliders = Row::new()
.width(Length::Units(500))
.spacing(20)
.push(
- Slider::new(r, 0.0..=1.0, background_color.r, move |r| {
+ Slider::new(0.0..=1.0, background_color.r, move |r| {
Message::BackgroundColorChanged(Color {
r,
..background_color
@@ -57,7 +54,7 @@ impl Program for Controls {
.step(0.01),
)
.push(
- Slider::new(g, 0.0..=1.0, background_color.g, move |g| {
+ Slider::new(0.0..=1.0, background_color.g, move |g| {
Message::BackgroundColorChanged(Color {
g,
..background_color
@@ -66,7 +63,7 @@ impl Program for Controls {
.step(0.01),
)
.push(
- Slider::new(b, 0.0..=1.0, background_color.b, move |b| {
+ Slider::new(0.0..=1.0, background_color.b, move |b| {
Message::BackgroundColorChanged(Color {
b,
..background_color
@@ -89,13 +86,13 @@ impl Program for Controls {
.spacing(10)
.push(
Text::new("Background color")
- .color(Color::WHITE),
+ .style(Color::WHITE),
)
.push(sliders)
.push(
Text::new(format!("{:?}", background_color))
.size(14)
- .color(Color::WHITE),
+ .style(Color::WHITE),
),
),
)
diff --git a/examples/integration_opengl/src/main.rs b/examples/integration_opengl/src/main.rs
index 1007b90f..f161c8a0 100644
--- a/examples/integration_opengl/src/main.rs
+++ b/examples/integration_opengl/src/main.rs
@@ -12,7 +12,8 @@ use iced_glow::glow;
use iced_glow::{Backend, Renderer, Settings, Viewport};
use iced_glutin::conversion;
use iced_glutin::glutin;
-use iced_glutin::{program, Clipboard, Debug, Size};
+use iced_glutin::renderer;
+use iced_glutin::{program, Clipboard, Color, Debug, Size};
pub fn main() {
env_logger::init();
@@ -57,7 +58,7 @@ pub fn main() {
let mut cursor_position = PhysicalPosition::new(-1.0, -1.0);
let mut modifiers = ModifiersState::default();
- let mut clipboard = Clipboard::connect(&windowed_context.window());
+ let mut clipboard = Clipboard::connect(windowed_context.window());
let mut renderer = Renderer::new(Backend::new(&gl, Settings::default()));
@@ -72,13 +73,12 @@ pub fn main() {
);
let mut resized = false;
- let scene = Scene::new(&gl, &shader_version);
+ let scene = Scene::new(&gl, shader_version);
event_loop.run(move |event, _, control_flow| {
*control_flow = ControlFlow::Wait;
match event {
- Event::LoopDestroyed => return,
Event::WindowEvent { event, .. } => {
match event {
WindowEvent::CursorMoved { position, .. } => {
@@ -125,6 +125,10 @@ pub fn main() {
viewport.scale_factor(),
),
&mut renderer,
+ &iced_glow::Theme::Dark,
+ &renderer::Style {
+ text_color: Color::WHITE,
+ },
&mut clipboard,
&mut debug,
);