Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: set total size of QRCode #2606

Merged
merged 3 commits into from
Oct 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 44 additions & 10 deletions examples/qr_code/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
use iced::widget::{center, column, pick_list, qr_code, row, text, text_input};
use iced::widget::{
center, column, pick_list, qr_code, row, slider, text, text_input, toggler,
};
use iced::{Center, Element, Theme};

use std::ops::RangeInclusive;

pub fn main() -> iced::Result {
iced::application(
"QR Code Generator - Iced",
Expand All @@ -15,16 +19,21 @@ pub fn main() -> iced::Result {
struct QRGenerator {
data: String,
qr_code: Option<qr_code::Data>,
total_size: Option<f32>,
theme: Theme,
}

#[derive(Debug, Clone)]
enum Message {
DataChanged(String),
ToggleTotalSize(bool),
TotalSizeChanged(f32),
ThemeChanged(Theme),
}

impl QRGenerator {
const SIZE_RANGE: RangeInclusive<f32> = 200.0..=400.0;

fn update(&mut self, message: Message) {
match message {
Message::DataChanged(mut data) => {
Expand All @@ -38,6 +47,16 @@ impl QRGenerator {

self.data = data;
}
Message::ToggleTotalSize(enabled) => {
self.total_size = enabled.then_some(
Self::SIZE_RANGE.start()
+ (Self::SIZE_RANGE.end() - Self::SIZE_RANGE.start())
/ 2.0,
);
}
Message::TotalSizeChanged(total_size) => {
self.total_size = Some(total_size);
}
Message::ThemeChanged(theme) => {
self.theme = theme;
}
Expand All @@ -53,22 +72,37 @@ impl QRGenerator {
.size(30)
.padding(15);

let toggle_total_size = toggler(self.total_size.is_some())
.on_toggle(Message::ToggleTotalSize)
.label("Limit Total Size");

let choose_theme = row![
text("Theme:"),
pick_list(Theme::ALL, Some(&self.theme), Message::ThemeChanged,)
]
.spacing(10)
.align_y(Center);

let content = column![title, input, choose_theme]
.push_maybe(
self.qr_code
.as_ref()
.map(|data| qr_code(data).cell_size(10)),
)
.width(700)
.spacing(20)
.align_x(Center);
let content = column![
title,
input,
row![toggle_total_size, choose_theme]
.spacing(20)
.align_y(Center)
]
.push_maybe(self.total_size.map(|total_size| {
slider(Self::SIZE_RANGE, total_size, Message::TotalSizeChanged)
}))
.push_maybe(self.qr_code.as_ref().map(|data| {
if let Some(total_size) = self.total_size {
qr_code(data).total_size(total_size)
} else {
qr_code(data).cell_size(10.0)
}
}))
.width(700)
.spacing(20)
.align_x(Center);

center(content).padding(20).into()
}
Expand Down
24 changes: 16 additions & 8 deletions widget/src/qr_code.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ use crate::core::mouse;
use crate::core::renderer::{self, Renderer as _};
use crate::core::widget::tree::{self, Tree};
use crate::core::{
Color, Element, Layout, Length, Point, Rectangle, Size, Theme, Vector,
Widget,
Color, Element, Layout, Length, Pixels, Point, Rectangle, Size, Theme,
Vector, Widget,
};
use crate::Renderer;

use std::cell::RefCell;
use thiserror::Error;

const DEFAULT_CELL_SIZE: u16 = 4;
const DEFAULT_CELL_SIZE: f32 = 4.0;
const QUIET_ZONE: usize = 2;

/// A type of matrix barcode consisting of squares arranged in a grid which
Expand Down Expand Up @@ -66,7 +66,7 @@ where
Theme: Catalog,
{
data: &'a Data,
cell_size: u16,
cell_size: f32,
class: Theme::Class<'a>,
}

Expand All @@ -84,8 +84,16 @@ where
}

/// Sets the size of the squares of the grid cell of the [`QRCode`].
pub fn cell_size(mut self, cell_size: u16) -> Self {
self.cell_size = cell_size;
pub fn cell_size(mut self, cell_size: impl Into<Pixels>) -> Self {
self.cell_size = cell_size.into().0;
self
}

/// Sets the size of the entire [`QRCode`].
pub fn total_size(mut self, total_size: impl Into<Pixels>) -> Self {
self.cell_size =
total_size.into().0 / (self.data.width + 2 * QUIET_ZONE) as f32;

self
}

Expand Down Expand Up @@ -133,8 +141,8 @@ where
_renderer: &Renderer,
_limits: &layout::Limits,
) -> layout::Node {
let side_length = (self.data.width + 2 * QUIET_ZONE) as f32
* f32::from(self.cell_size);
let side_length =
(self.data.width + 2 * QUIET_ZONE) as f32 * self.cell_size;

layout::Node::new(Size::new(side_length, side_length))
}
Expand Down
Loading