fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-09-19 19:08:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename GUI Layout to Layout System

Browse Source
This commit is contained in:
Keavon Chambers
2020-06-10 14:01:50 -07:00
parent 559833be8e
commit f32f39d5a6
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/application.rs
View File

@@ -3,7 +3,7 @@ use crate::window_events;
use crate::pipeline::Pipeline;
use crate::texture::Texture;
use crate::resource_cache::ResourceCache;
use crate::gui_layout::GuiLayout;
use crate::layout_system::LayoutSystem;
use crate::gui_node::GuiNode;
use winit::event::*;
use winit::event_loop::*;
@@ -70,7 +70,7 @@ impl Application {
// Data structure maintaining the user interface
let gui_rect_pipeline = Pipeline::new(
&device, swap_chain_descriptor.format, Vec::new(), &mut shader_cache, ("shaders/shader.vert", "shaders/shader.frag")
&device, swap_chain_descriptor.format, Vec::new(), &mut shader_cache, ("shaders/shader.vert", "shaders/shader.frag"),
);
pipeline_cache.set("gui_rect", gui_rect_pipeline);
@@ -79,7 +79,7 @@ impl Application {
let gui_root = rctree::Node::new(gui_root_data);
// Main window in the XML layout language
let mut main_window_layout = GuiLayout::new();
let mut main_window_layout = LayoutSystem::new();
main_window_layout.load_layout("window", "main");
Self {