Skip to content

Commit f923b7f

Browse files
MoAlyousefMoAlyousef
committed
update pics
1 parent b8e0f50 commit f923b7f

29 files changed

+108
-97
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ These provide schemes for widgets without color theming. Currently there are 6 s
181181

182182
- Fluent: Tries to mimic Window's 10 styles.
183183
- ![alt_test](screenshots/fluent.jpg)
184-
- ![alt_test](screenshots/fluent2.jpg)
184+
- ![alt_test](screenshots/fluent_dark.jpg)
185185

186186
- SvgBased: This overrides FLTK's Base scheme round/rounded/oval FrameTypes which are drawn using scalable vector graphics.
187187
- ![alt_test](screenshots/svgbased.jpg)

‎examples/aqua_dark.rs

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ use fltk_theme::colors::aqua::dark::*; // get all the dark aqua colors
1010

1111
fn main() {
1212
let a = app::App::default();
13+
app::set_font_size(12);
1314
let bg = windowBackgroundColor.to_rgb();
1415
app::background(bg.0, bg.1, bg.2);
1516
let ctrl = controlAccentColor.to_rgb();
@@ -19,23 +20,32 @@ fn main() {
1920
app::set_color(Color::Selection, 255, 255, 255);
2021
let widget_scheme = WidgetScheme::new(SchemeType::Aqua);
2122
widget_scheme.apply();
22-
let mut win = window::Window::default().with_size(400, 300);
23-
let mut choice = menu::Choice::new(100, 50, 200, 30, None);
23+
let mut win = window::Window::default()
24+
.with_size(400, 300)
25+
.with_label("Aqua Dark");
26+
let mut col = group::Flex::default()
27+
.with_size(340, 240)
28+
.center_of_parent()
29+
.column();
30+
col.set_frame(FrameType::EngravedBox);
31+
col.set_margins(100, 40, 100, 40);
32+
let mut choice = menu::Choice::default();
2433
choice.set_color(*controlColor);
2534
choice.add_choice("Opt1|Opt2|Opt3");
2635
choice.set_value(2);
27-
let mut inp = input::Input::new(50, 100, 300, 30, None);
36+
let mut inp = input::Input::default();
2837
inp.set_color(*controlColor);
29-
let mut check = button::CheckButton::new(160, 150, 80, 30, " Check");
38+
let mut check = button::CheckButton::default().with_label(" Check");
3039
check.set_value(true);
3140
check.set_frame(enums::FrameType::FlatBox);
32-
let mut round = button::RoundButton::new(160, 180, 80, 30, " Round");
41+
let mut round = button::RoundButton::default().with_label(" Round");
3342
round.set_value(true);
3443
round.set_frame(enums::FrameType::FlatBox);
35-
let mut btn = button::Button::new(160, 230, 80, 30, "Hello");
44+
let mut btn = button::Button::default().with_label("Hello");
3645
btn.set_color(*controlColor);
3746
btn.set_selection_color(*controlAccentColor);
3847
btn.set_frame(OS_DEFAULT_BUTTON_UP_BOX);
48+
col.end();
3949
win.end();
4050
win.make_resizable(true);
4151
win.show();

‎examples/fluent.rs

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ use fltk_theme::{SchemeType, WidgetScheme};
55

66
fn main() {
77
let a = app::App::default();
8+
app::set_font_size(12);
89
app::background(0xFC, 0xFC, 0xFC);
910
app::background2(0xFF, 0xFF, 0xFF);
1011
app::foreground(0x00, 0x00, 0x00);
@@ -16,22 +17,30 @@ fn main() {
1617
);
1718
let theme = WidgetScheme::new(SchemeType::Fluent);
1819
theme.apply();
19-
let mut win = window::SingleWindow::default().with_size(400, 300);
20-
let mut choice = menu::Choice::new(100, 100, 200, 30, None);
20+
let mut win = window::SingleWindow::default()
21+
.with_size(400, 300)
22+
.with_label("Fluent");
23+
let mut col = group::Flex::default()
24+
.with_size(340, 240)
25+
.center_of_parent()
26+
.column();
27+
col.set_frame(FrameType::EngravedBox);
28+
col.set_margins(100, 60, 100, 60);
29+
let mut choice = menu::Choice::default();
2130
choice.add_choice("Fluent");
2231
choice.set_value(0);
2332
choice.set_frame(FrameType::FlatBox);
24-
let mut check = button::CheckButton::new(160, 150, 80, 30, " Check");
33+
let mut check = button::CheckButton::default().with_label(" Check");
2534
check.set_value(true);
2635
check.set_frame(FrameType::FlatBox);
27-
let mut round = button::RoundButton::new(160, 180, 80, 30, " Round");
36+
let mut round = button::RoundButton::default().with_label(" Round");
2837
round.set_value(true);
2938
round.set_frame(FrameType::FlatBox);
30-
let mut toggle = button::ToggleButton::new(100, 220, 80, 30, "Toggle");
39+
let mut toggle = button::ToggleButton::default().with_label("Toggle");
3140
toggle.set_color(Color::from_rgba_tuple(ACCENT_COLOR));
3241
toggle.set_label_color(Color::White);
3342
toggle.set_selection_color(toggle.color().darker());
34-
let mut btn = button::Button::new(220, 220, 80, 30, "Hello");
43+
let mut btn = button::Button::default().with_label("Hello");
3544
btn.set_frame(OS_DEFAULT_BUTTON_UP_BOX);
3645
btn.set_down_frame(OS_DEFAULT_DEPRESSED_DOWN_BOX);
3746
// handle hover
@@ -48,6 +57,7 @@ fn main() {
4857
}
4958
_ => false,
5059
});
60+
col.end();
5161
win.end();
5262
win.make_resizable(true);
5363
win.show();

‎examples/fluent_dark.rs

Lines changed: 28 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ use fltk_theme::{SchemeType, WidgetScheme};
55

66
fn main() {
77
let a = app::App::default();
8+
app::set_font_size(12);
89
app::background(0x00, 0x00, 0x00);
910
app::background2(0x00, 0x00, 0x00);
1011
app::foreground(0xff, 0xff, 0xff);
@@ -16,34 +17,42 @@ fn main() {
1617
);
1718
let theme = WidgetScheme::new(SchemeType::Fluent);
1819
theme.apply();
19-
let mut win = window::Window::default().with_size(400, 300);
20-
let mut choice = menu::Choice::new(100, 100, 200, 30, None);
20+
let mut win = window::Window::default()
21+
.with_size(400, 300)
22+
.with_label("Fluent Dark");
23+
let mut col = group::Flex::default()
24+
.with_size(340, 240)
25+
.center_of_parent()
26+
.column();
27+
col.set_frame(FrameType::EngravedBox);
28+
col.set_margins(100, 60, 100, 60);
29+
let mut choice = menu::Choice::default();
2130
choice.add_choice("Fluent");
2231
choice.set_value(0);
2332
choice.set_frame(FrameType::FlatBox);
24-
choice.draw(|c| {
25-
draw::set_draw_color(Color::Background);
26-
draw::draw_polygon(
27-
c.x() + c.w() - 18,
28-
(c.y() + c.h() / 2) - 6,
29-
c.x() + c.w() - 13,
30-
(c.y() + c.h() / 2) - 1,
31-
c.x() + c.w() - 7,
32-
(c.y() + c.h() / 2) - 6,
33-
);
34-
draw::end_polygon();
35-
});
36-
let mut check = button::CheckButton::new(160, 150, 80, 30, " Check");
33+
// choice.draw(|c| {
34+
// draw::set_draw_color(Color::Background);
35+
// draw::draw_polygon(
36+
// c.x() + c.w() - 18,
37+
// (c.y() + c.h() / 2) - 6,
38+
// c.x() + c.w() - 13,
39+
// (c.y() + c.h() / 2) - 1,
40+
// c.x() + c.w() - 7,
41+
// (c.y() + c.h() / 2) - 6,
42+
// );
43+
// draw::end_polygon();
44+
// });
45+
let mut check = button::CheckButton::default().with_label(" Check");
3746
check.set_value(true);
3847
check.set_frame(FrameType::FlatBox);
39-
let mut round = button::RoundButton::new(160, 180, 80, 30, " Round");
48+
let mut round = button::RoundButton::default().with_label(" Round");
4049
round.set_value(true);
4150
round.set_frame(FrameType::FlatBox);
42-
let mut toggle = button::ToggleButton::new(100, 220, 80, 30, "Toggle");
51+
let mut toggle = button::ToggleButton::default().with_label("Toggle");
4352
toggle.set_color(Color::from_rgba_tuple(ACCENT_COLOR));
4453
toggle.set_label_color(Color::White);
4554
toggle.set_selection_color(toggle.color().darker());
46-
let mut btn = button::Button::new(220, 220, 80, 30, "Hello");
55+
let mut btn = button::Button::default().with_label("Hello");
4756
btn.set_frame(OS_DEFAULT_BUTTON_UP_BOX);
4857
btn.set_down_frame(OS_DEFAULT_DEPRESSED_DOWN_BOX);
4958
// handle hover
@@ -60,6 +69,7 @@ fn main() {
6069
}
6170
_ => false,
6271
});
72+
col.end();
6373
win.end();
6474
win.make_resizable(true);
6575
win.show();

‎examples/predef_color.rs

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,32 @@
1-
use fltk::{prelude::*, *};
2-
use fltk_theme::{reset_color_map, color_themes, ColorTheme};
1+
use fltk::{enums::*, prelude::*, *};
2+
use fltk_theme::{color_themes, reset_color_map, ColorTheme};
33

44
fn main() {
55
let a = app::App::default().with_scheme(app::Scheme::Gtk);
66
app::set_visible_focus(false);
7-
87
let color_theme = ColorTheme::new(color_themes::BLACK_THEME);
98
color_theme.apply();
10-
let mut win = window::Window::default().with_size(400, 300);
11-
let mut choice = menu::Choice::new(100, 100, 200, 30, None);
9+
let mut win = window::Window::default()
10+
.with_size(400, 300)
11+
.with_label("Color Theme");
12+
let mut col = group::Flex::default()
13+
.with_size(340, 240)
14+
.center_of_parent()
15+
.column();
16+
col.set_frame(FrameType::EngravedBox);
17+
col.set_margins(100, 60, 100, 60);
18+
let mut choice = menu::Choice::default();
1219
choice.add_choice("Black|Dark|Gray|Shake|Tan");
1320
choice.set_value(0);
14-
let mut check = button::CheckButton::new(160, 150, 80, 30, " Check");
21+
let mut check = button::CheckButton::default().with_label(" Check");
1522
check.set_value(true);
1623
check.set_frame(enums::FrameType::FlatBox);
17-
let mut round = button::RoundButton::new(160, 180, 80, 30, " Round");
24+
let mut round = button::RoundButton::default().with_label(" Round");
1825
round.set_value(true);
1926
round.set_frame(enums::FrameType::FlatBox);
20-
let mut button = button::Button::new(160, 220, 80, 30, "Hello");
27+
let mut button = button::Button::default().with_label("Hello");
2128
button.set_callback(|_| reset_color_map());
29+
col.end();
2230
win.end();
2331
win.show();
2432
choice.set_callback(|c| {

‎examples/tabs.rs

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎examples/widget_scheme.rs

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,28 @@
1-
use fltk::{prelude::*, *};
1+
use fltk::{enums::*, prelude::*, *};
22
use fltk_theme::{SchemeType, WidgetScheme};
33

44
fn main() {
55
let a = app::App::default();
66
let scheme = WidgetScheme::new(SchemeType::Clean);
77
scheme.apply();
8-
let mut win = window::Window::default().with_size(400, 300);
9-
let mut choice = menu::Choice::new(100, 100, 200, 30, None);
8+
let mut win = window::Window::default()
9+
.with_size(400, 300)
10+
.with_label("Widget Scheme");
11+
let mut col = group::Flex::default()
12+
.with_size(340, 240)
13+
.center_of_parent()
14+
.column();
15+
col.set_frame(FrameType::EngravedBox);
16+
col.set_margins(100, 60, 100, 60);
17+
let mut choice = menu::Choice::default();
1018
choice.add_choice("Clean|Crystal|Gleam");
1119
choice.set_value(3);
12-
let mut check = button::CheckButton::new(160, 150, 80, 30, "Check");
20+
let mut check = button::CheckButton::default().with_label("Check");
1321
check.set_value(true);
14-
let mut round = button::RoundButton::new(160, 180, 80, 30, "Round");
22+
let mut round = button::RoundButton::default().with_label("Round");
1523
round.set_value(true);
16-
let mut _btn = button::Button::new(160, 220, 80, 30, "Hello");
24+
let mut _btn = button::Button::default().with_label("Hello");
25+
col.end();
1726
win.end();
1827
win.show();
1928
choice.set_callback(|c| {

‎examples/widget_theme.rs

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,32 @@
1-
use fltk::{prelude::*, *};
1+
use fltk::{enums::*, prelude::*, *};
22
use fltk_theme::{widget_themes, ThemeType, WidgetTheme};
33

44
fn main() {
55
let a = app::App::default();
66
let theme = WidgetTheme::new(ThemeType::AquaClassic);
77
theme.apply();
8-
let mut win = window::Window::default().with_size(400, 300);
9-
let mut choice = menu::Choice::new(100, 100, 200, 30, None);
8+
let mut win = window::Window::default()
9+
.with_size(400, 300)
10+
.with_label("Widget Theme");
11+
let mut col = group::Flex::default()
12+
.with_size(340, 240)
13+
.center_of_parent()
14+
.column();
15+
col.set_frame(FrameType::EngravedBox);
16+
col.set_margins(100, 60, 100, 60);
17+
let mut choice = menu::Choice::default();
1018
choice.add_choice("Classic|Aero|Metro|AquaClassic|Greybird|Blue|HighContrast|Dark");
1119
choice.set_value(3);
1220
choice.set_frame(widget_themes::OS_PANEL_THIN_UP_BOX);
13-
let mut check = button::CheckButton::new(160, 150, 80, 30, " Check");
21+
let mut check = button::CheckButton::default().with_label(" Check");
1422
check.set_value(true);
1523
check.set_frame(enums::FrameType::FlatBox);
16-
let mut round = button::RoundButton::new(160, 180, 80, 30, " Round");
24+
let mut round = button::RoundButton::default().with_label(" Round");
1725
round.set_value(true);
1826
round.set_frame(enums::FrameType::FlatBox);
19-
let mut btn = button::Button::new(160, 220, 80, 30, "Hello");
27+
let mut btn = button::Button::default().with_label("Hello");
2028
btn.set_frame(widget_themes::OS_DEFAULT_BUTTON_UP_BOX);
29+
col.end();
2130
win.end();
2231
win.show();
2332
choice.set_callback(|c| {

‎screenshots/aero.jpg

11.9 KB
Loading

‎screenshots/aqua_classic.jpg

12.1 KB
Loading

‎screenshots/black.jpg

8.85 KB
Loading

‎screenshots/blue.jpg

10.5 KB
Loading

‎screenshots/classic.jpg

12.6 KB
Loading

‎screenshots/clean.jpg

6.72 KB
Loading

‎screenshots/crystal.jpg

13.9 KB
Loading

‎screenshots/dark.jpg

15.3 KB
Loading

‎screenshots/dark_color.jpg

10.7 KB
Loading

‎screenshots/fluent.jpg

-5.62 KB
Loading

‎screenshots/fluent2.jpg

-27.9 KB
Binary file not shown.

‎screenshots/fluent_dark.jpg

29.2 KB
Loading

‎screenshots/gleam.jpg

14.5 KB
Loading

‎screenshots/greybird.jpg

8.74 KB
Loading

‎screenshots/high_contrast.jpg

17.5 KB
Loading

‎screenshots/metro.jpg

11.6 KB
Loading

‎screenshots/plain-gray.jpg

11.4 KB
Loading

‎screenshots/shake.jpg

9.92 KB
Loading

‎screenshots/svgbased.jpg

2.25 KB
Loading

‎screenshots/tan.jpg

8.91 KB
Loading

‎src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ impl ColorTheme {
6161
let mut default_map = Vec::with_capacity(256);
6262
for index in 0..=255 {
6363
let (r, g, b) = Color::by_index(index).to_rgb();
64-
default_map.push(ColorMap {index, r, g, b });
64+
default_map.push(ColorMap { index, r, g, b });
6565
}
6666
DEFAULT_COLOR_MAP.set(default_map).unwrap();
6767
}

0 commit comments

Comments
 (0)