graphic design tool
git clone https://git.lucas.co/cce-designer.git
Clean up compiler warnings
src/app.rs | 16 ++++++----------
src/graphics.rs | 1 -
src/main.rs | 19 +++++++++++--------
src/window.rs | 35 ++++++++---------------------------
4 files changed, 25 insertions(+), 46 deletions(-)
diff --git a/src/app.rs b/src/app.rs
index 5b11f06..c02d0f2 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -1,3 +1,4 @@
+#![allow(unused_imports)]
use std::time::Instant;
use std::fs;
use std::path::Path;
@@ -29,26 +30,21 @@ use smithay_client_toolkit::{
shm::{Shm, ShmHandler},
};
use wayland_client::{
- globals::registry_queue_init,
- protocol::{wl_keyboard, wl_output, wl_pointer, wl_seat, wl_shm, wl_surface},
+ protocol::wl_surface,
Connection, QueueHandle, Proxy,
};
-use calloop_wayland_source::WaylandSource;
use wgpu::util::DeviceExt;
-use cce_ui::widget::{Breadcrumb, Canvas, MenuBar, Plate, ParametersBg, Splitter, Spreadsheet, StatusBar, TextLabel, ViewportBg, Element, GraphNode, Graph, Paginator, Button, Checkbox, Slider, Spinbox, ScrollingList, Label, ColorSelector, Switcher};
+use cce_ui::widget::{Breadcrumb, Canvas, MenuBar, Plate, ParametersBg, Splitter, Spreadsheet, StatusBar, TextLabel, ViewportBg, Element, GraphNode, Graph, Paginator, Button, Checkbox, ScrollingList, Label};
use cce_ui::colors;
-use cce_ui::engine::quad_vertices_with_clip;
-use glyphon::{Attrs, Buffer, Cache, FontSystem, Metrics, Resolution, SwashCache, TextArea, TextAtlas, TextBounds, TextRenderer, Viewport};
+use glyphon::{Attrs, Buffer, Cache, FontSystem, Metrics, Resolution, TextAtlas, TextRenderer, Viewport};
use glam::{Mat4, Vec3};
use crate::geometry::*;
-use crate::project::*;
-use crate::render::*;
-use crate::shortcut::{Shortcut, ShortcutManager, Action};
+use crate::shortcut::{ShortcutManager, Action};
use crate::graphics::TexturedVertex;
use cce_ui::engine::Vertex;
-use crate::window::{AppState, WindowEvent, LocalPosition};
+use crate::window::{AppState, WindowEvent};
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum TouchPhase {
diff --git a/src/graphics.rs b/src/graphics.rs
index 0f8202f..e467a5a 100644
--- a/src/graphics.rs
+++ b/src/graphics.rs
@@ -1,4 +1,3 @@
-use cce_ui::engine::Vertex;
#[repr(C)]
#[derive(Debug, Clone, Copy, bytemuck::Pod, bytemuck::Zeroable)]
diff --git a/src/main.rs b/src/main.rs
index d1b503e..18058b7 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,10 +1,16 @@
+#![allow(unused_imports)]
use std::time::Instant;
+#[cfg(test)]
use std::fs;
+#[cfg(test)]
use std::path::Path;
use serde::{Deserialize, Serialize};
-use cce_ui::widget::{ElementState, MouseButton, MouseScrollDelta, KeyEvent, Key, NamedKey};
+#[cfg(test)]
+use cce_ui::widget::{ElementState, MouseButton, MouseScrollDelta, KeyEvent};
+#[cfg(test)]
+use cce_ui::widget::{Key, NamedKey};
use smithay_client_toolkit::{
compositor::{CompositorHandler, CompositorState},
@@ -19,7 +25,7 @@ use smithay_client_toolkit::{
},
shell::{
xdg::{
- window::{Window as XdgWindow, WindowConfigure, WindowHandler, WindowDecorations},
+ window::{Window as XdgWindow, WindowConfigure, WindowDecorations},
XdgShell,
},
},
@@ -27,14 +33,11 @@ use smithay_client_toolkit::{
};
use wayland_client::{
globals::registry_queue_init,
- protocol::{wl_keyboard, wl_output, wl_pointer, wl_seat, wl_shm, wl_surface},
- Connection, QueueHandle, Proxy,
+ Connection,
};
use calloop_wayland_source::WaylandSource;
-use cce_ui::widget::{Breadcrumb, Canvas, MenuBar, Plate, ParametersBg, Splitter, Spreadsheet, StatusBar, ViewportBg, GraphNode, Graph, Paginator, Button, Checkbox, Slider, Spinbox, ScrollingList, Label, ColorSelector, Switcher};
-use wgpu::util::DeviceExt;
-use glyphon::{Attrs, Buffer, Cache, FontSystem, Metrics, Resolution, SwashCache, TextArea, TextAtlas, TextBounds, TextRenderer, Viewport};
+#[cfg(test)]
use glam::{Mat4, Vec3};
pub mod app;
@@ -270,7 +273,7 @@ fn create_memfd_with_data(name: &str, data: &[u8]) -> std::io::Result<std::os::u
#[cfg(test)]
mod tests {
use super::*;
- use crate::app::{get_next_visible_pane, LEFT_MENUBAR_IDX, RIGHT_MENUBAR_IDX, PARAM_MENUBAR_IDX, SPREADSHEET_MENUBAR_IDX, DesignSettings, param_display, FsNode, Project, ProjectViewState, ParamDef, TouchPhase};
+ use crate::app::{get_next_visible_pane, LEFT_MENUBAR_IDX, RIGHT_MENUBAR_IDX, PARAM_MENUBAR_IDX, SPREADSHEET_MENUBAR_IDX, DesignSettings, FsNode, Project, ProjectViewState};
use crate::shortcut::{Shortcut, ShortcutManager, Action};
use crate::geometry::{GAttribute, GVertex, Geometry, line_vertices};
diff --git a/src/window.rs b/src/window.rs
index dc77da9..9acbacf 100644
--- a/src/window.rs
+++ b/src/window.rs
@@ -1,12 +1,5 @@
-use std::time::Instant;
-use std::fs;
+#![allow(unused_imports)]
use std::path::Path;
-use std::net::TcpListener;
-
-
-use serde::{Deserialize, Serialize};
-
-use cce_ui::widget::{ElementState, MouseButton, MouseScrollDelta, KeyEvent, Key, NamedKey};
use smithay_client_toolkit::{
compositor::{CompositorHandler, CompositorState},
@@ -21,32 +14,20 @@ use smithay_client_toolkit::{
},
shell::{
xdg::{
- window::{Window as XdgWindow, WindowConfigure, WindowHandler, WindowDecorations},
+ window::{Window as XdgWindow, WindowConfigure, WindowHandler},
XdgShell,
},
-
},
shm::{Shm, ShmHandler},
};
use wayland_client::{
- globals::registry_queue_init,
- protocol::{wl_keyboard, wl_output, wl_pointer, wl_seat, wl_shm, wl_surface},
- Connection, QueueHandle, Proxy,
+ protocol::{wl_keyboard, wl_output, wl_pointer, wl_seat, wl_surface},
+ Connection, QueueHandle,
};
-use calloop_wayland_source::WaylandSource;
-
-use wgpu::util::DeviceExt;
-use cce_ui::widget::{Breadcrumb, Canvas, MenuBar, Plate, ParametersBg, Splitter, Spreadsheet, StatusBar, TextLabel, ViewportBg, Element, GraphNode, Graph, Paginator, Button, Checkbox, Slider, Spinbox, ScrollingList, Label, ColorSelector, Switcher};
-use cce_ui::colors;
-use glyphon::{Attrs, Buffer, Cache, FontSystem, Metrics, Resolution, SwashCache, TextArea, TextAtlas, TextBounds, TextRenderer, Viewport};
-use glam::{Mat4, Vec3};
-
-use crate::geometry::*;
-use crate::project::*;
-use crate::render::*;
-use crate::shortcut::{Shortcut, ShortcutManager, Action};
-use crate::app::{State, CustomEvent, HttpAction, ModifiersState, TouchPhase, DesignSettings, param_display, NodePalette, NODE_PALETTE_IDX, LEFT_MENUBAR_IDX, RIGHT_MENUBAR_IDX, PARAM_MENUBAR_IDX, SPREADSHEET_MENUBAR_IDX, HEADER_IDX, CONTENT_IDX, BREADCRUMB_IDX, VIEWPORT_IDX, PARAM_IDX, SPREADSHEET_IDX, PAGINATOR_IDX, get_next_visible_pane, Project, ProjectViewState, ParamDef};
-use cce_ui::engine::Vertex;
+
+use cce_ui::widget::Element;
+use crate::shortcut::Action;
+use crate::app::{State, CustomEvent, HttpAction, ModifiersState, TouchPhase, LEFT_MENUBAR_IDX, RIGHT_MENUBAR_IDX, PARAM_MENUBAR_IDX, SPREADSHEET_MENUBAR_IDX, HEADER_IDX, CONTENT_IDX, BREADCRUMB_IDX, VIEWPORT_IDX, PARAM_IDX, SPREADSHEET_IDX, PAGINATOR_IDX, get_next_visible_pane, Project, ProjectViewState, ParamDef, param_display};
#[derive(Debug, Clone, Copy)]
pub struct LocalPosition {