chore: simplified layer shell example
- The layer shell example now opens only one window instead of opening multiple windows.
This commit is contained in:
@@ -0,0 +1,93 @@
|
|||||||
|
Digitized data copyright (c) 2012-2015, The Mozilla Foundation and Telefonica S.A.
|
||||||
|
|
||||||
|
This Font Software is licensed under the SIL Open Font License, Version 1.1.
|
||||||
|
This license is copied below, and is also available with a FAQ at:
|
||||||
|
http://scripts.sil.org/OFL
|
||||||
|
|
||||||
|
|
||||||
|
-----------------------------------------------------------
|
||||||
|
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
|
||||||
|
-----------------------------------------------------------
|
||||||
|
|
||||||
|
PREAMBLE
|
||||||
|
The goals of the Open Font License (OFL) are to stimulate worldwide
|
||||||
|
development of collaborative font projects, to support the font creation
|
||||||
|
efforts of academic and linguistic communities, and to provide a free and
|
||||||
|
open framework in which fonts may be shared and improved in partnership
|
||||||
|
with others.
|
||||||
|
|
||||||
|
The OFL allows the licensed fonts to be used, studied, modified and
|
||||||
|
redistributed freely as long as they are not sold by themselves. The
|
||||||
|
fonts, including any derivative works, can be bundled, embedded,
|
||||||
|
redistributed and/or sold with any software provided that any reserved
|
||||||
|
names are not used by derivative works. The fonts and derivatives,
|
||||||
|
however, cannot be released under any other type of license. The
|
||||||
|
requirement for fonts to remain under this license does not apply
|
||||||
|
to any document created using the fonts or their derivatives.
|
||||||
|
|
||||||
|
DEFINITIONS
|
||||||
|
"Font Software" refers to the set of files released by the Copyright
|
||||||
|
Holder(s) under this license and clearly marked as such. This may
|
||||||
|
include source files, build scripts and documentation.
|
||||||
|
|
||||||
|
"Reserved Font Name" refers to any names specified as such after the
|
||||||
|
copyright statement(s).
|
||||||
|
|
||||||
|
"Original Version" refers to the collection of Font Software components as
|
||||||
|
distributed by the Copyright Holder(s).
|
||||||
|
|
||||||
|
"Modified Version" refers to any derivative made by adding to, deleting,
|
||||||
|
or substituting -- in part or in whole -- any of the components of the
|
||||||
|
Original Version, by changing formats or by porting the Font Software to a
|
||||||
|
new environment.
|
||||||
|
|
||||||
|
"Author" refers to any designer, engineer, programmer, technical
|
||||||
|
writer or other person who contributed to the Font Software.
|
||||||
|
|
||||||
|
PERMISSION & CONDITIONS
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining
|
||||||
|
a copy of the Font Software, to use, study, copy, merge, embed, modify,
|
||||||
|
redistribute, and sell modified and unmodified copies of the Font
|
||||||
|
Software, subject to the following conditions:
|
||||||
|
|
||||||
|
1) Neither the Font Software nor any of its individual components,
|
||||||
|
in Original or Modified Versions, may be sold by itself.
|
||||||
|
|
||||||
|
2) Original or Modified Versions of the Font Software may be bundled,
|
||||||
|
redistributed and/or sold with any software, provided that each copy
|
||||||
|
contains the above copyright notice and this license. These can be
|
||||||
|
included either as stand-alone text files, human-readable headers or
|
||||||
|
in the appropriate machine-readable metadata fields within text or
|
||||||
|
binary files as long as those fields can be easily viewed by the user.
|
||||||
|
|
||||||
|
3) No Modified Version of the Font Software may use the Reserved Font
|
||||||
|
Name(s) unless explicit written permission is granted by the corresponding
|
||||||
|
Copyright Holder. This restriction only applies to the primary font name as
|
||||||
|
presented to the users.
|
||||||
|
|
||||||
|
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
|
||||||
|
Software shall not be used to promote, endorse or advertise any
|
||||||
|
Modified Version, except to acknowledge the contribution(s) of the
|
||||||
|
Copyright Holder(s) and the Author(s) or with their explicit written
|
||||||
|
permission.
|
||||||
|
|
||||||
|
5) The Font Software, modified or unmodified, in part or in whole,
|
||||||
|
must be distributed entirely under this license, and must not be
|
||||||
|
distributed under any other license. The requirement for fonts to
|
||||||
|
remain under this license does not apply to any document created
|
||||||
|
using the Font Software.
|
||||||
|
|
||||||
|
TERMINATION
|
||||||
|
This license becomes null and void if any of the above conditions are
|
||||||
|
not met.
|
||||||
|
|
||||||
|
DISCLAIMER
|
||||||
|
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||||
|
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
|
||||||
|
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
|
||||||
|
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
|
||||||
|
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||||
|
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
|
||||||
|
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||||
|
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
|
||||||
|
OTHER DEALINGS IN THE FONT SOFTWARE.
|
||||||
Executable
BIN
Binary file not shown.
Executable
BIN
Binary file not shown.
@@ -28,12 +28,8 @@ fn main() {
|
|||||||
}),
|
}),
|
||||||
WaylandPlugin,
|
WaylandPlugin,
|
||||||
))
|
))
|
||||||
.init_resource::<NewWindowInfo>()
|
|
||||||
.add_systems(Startup, setup)
|
.add_systems(Startup, setup)
|
||||||
.add_systems(
|
.add_systems(Update, (button_system, exit_on_esc))
|
||||||
Update,
|
|
||||||
(button_system, spawn_window, setup_new_window, exit_on_esc),
|
|
||||||
)
|
|
||||||
.run();
|
.run();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -72,18 +68,13 @@ fn button_system(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Component, Deref, DerefMut)]
|
|
||||||
struct WindowTimer(Timer);
|
|
||||||
fn setup(mut commands: Commands, assets: Res<AssetServer>, windows: Query<Entity, With<Window>>) {
|
fn setup(mut commands: Commands, assets: Res<AssetServer>, windows: Query<Entity, With<Window>>) {
|
||||||
for entity in &windows {
|
for entity in &windows {
|
||||||
commands.entity(entity).insert((
|
commands.entity(entity).insert((LayerShellSettings {
|
||||||
LayerShellSettings {
|
anchor: Anchor::TOP | Anchor::LEFT,
|
||||||
anchor: Anchor::TOP | Anchor::LEFT,
|
layer: Layer::Bottom,
|
||||||
layer: Layer::Bottom,
|
..Default::default()
|
||||||
..Default::default()
|
},));
|
||||||
},
|
|
||||||
InputRegion(Rect::new(0., 0., 200., 200.)),
|
|
||||||
));
|
|
||||||
}
|
}
|
||||||
// ui camera
|
// ui camera
|
||||||
commands.spawn(Camera2d);
|
commands.spawn(Camera2d);
|
||||||
@@ -96,69 +87,6 @@ fn exit_on_esc(keys: Res<ButtonInput<KeyCode>>) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn spawn_window(
|
|
||||||
mut commands: Commands,
|
|
||||||
mut windows: Query<(Entity, &mut WindowTimer)>,
|
|
||||||
mut new_window_info: ResMut<NewWindowInfo>,
|
|
||||||
keys: Res<ButtonInput<KeyCode>>,
|
|
||||||
time: Res<Time>,
|
|
||||||
) {
|
|
||||||
if keys.pressed(KeyCode::KeyN) {
|
|
||||||
println!("Pressed");
|
|
||||||
let new_window_entity = commands
|
|
||||||
.spawn((
|
|
||||||
Window {
|
|
||||||
title: "UI Only Window".to_string(),
|
|
||||||
resolution: (400., 50.).into(),
|
|
||||||
..default()
|
|
||||||
},
|
|
||||||
LayerShellSettings {
|
|
||||||
layer: Layer::Top,
|
|
||||||
anchor: Anchor::TOP | Anchor::LEFT,
|
|
||||||
..default()
|
|
||||||
},
|
|
||||||
WindowTimer(Timer::new(Duration::from_secs(5), TimerMode::Once)),
|
|
||||||
))
|
|
||||||
.id();
|
|
||||||
|
|
||||||
new_window_info.entity = Some(new_window_entity);
|
|
||||||
new_window_info.is_setup_pending = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Resource, Default)]
|
|
||||||
struct NewWindowInfo {
|
|
||||||
entity: Option<Entity>,
|
|
||||||
is_setup_pending: bool,
|
|
||||||
}
|
|
||||||
fn setup_new_window(
|
|
||||||
mut commands: Commands,
|
|
||||||
mut window_created_events: EventReader<WindowCreated>,
|
|
||||||
mut new_window_info: ResMut<NewWindowInfo>,
|
|
||||||
asset_server: Res<AssetServer>, // For fonts
|
|
||||||
) {
|
|
||||||
for event in window_created_events.read() {
|
|
||||||
if Some(event.window) == new_window_info.entity && new_window_info.is_setup_pending {
|
|
||||||
info!(
|
|
||||||
"New UI window created (ID: {:?}), setting up its camera and UI.",
|
|
||||||
event.window
|
|
||||||
);
|
|
||||||
|
|
||||||
commands.spawn((
|
|
||||||
Camera {
|
|
||||||
target: bevy::render::camera::RenderTarget::Window(
|
|
||||||
bevy::window::WindowRef::Entity(event.window),
|
|
||||||
),
|
|
||||||
clear_color: ClearColorConfig::Custom(Color::default()),
|
|
||||||
..default()
|
|
||||||
},
|
|
||||||
Camera2d,
|
|
||||||
));
|
|
||||||
new_window_info.is_setup_pending = false; // Mark as setup complete
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn button(asset_server: &AssetServer) -> impl Bundle + use<> {
|
fn button(asset_server: &AssetServer) -> impl Bundle + use<> {
|
||||||
(
|
(
|
||||||
Node {
|
Node {
|
||||||
Reference in New Issue
Block a user