Skip to content

Commit 60caed2

Browse files
Review
1 parent dbcdbf8 commit 60caed2

6 files changed

Lines changed: 12 additions & 7 deletions

File tree

desktop/src/lib.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ pub fn start() -> ExitCode {
3131
UiSetupResult::Ready(context) => context,
3232
UiSetupResult::Helper(code) => return code,
3333
UiSetupResult::Failed => {
34-
eprintln!("Failed to set up the UI runtime");
34+
tracing::error!("Failed to set up the UI runtime");
3535
return ExitCode::FAILURE;
3636
}
3737
};
@@ -45,7 +45,8 @@ pub fn start() -> ExitCode {
4545
.truncate(true)
4646
.open(dirs::app_data_dir().join(APP_LOCK_FILE_NAME))
4747
else {
48-
panic!("Failed to open lock file.")
48+
tracing::error!("Failed to open lock file.");
49+
return ExitCode::FAILURE;
4950
};
5051
let mut lock = fd_lock::RwLock::new(lock_file);
5152
let lock = match lock.try_write() {
@@ -123,8 +124,8 @@ pub fn start() -> ExitCode {
123124
Some(message) => scheduler.schedule(AppEvent::DesktopWrapperMessage(message)),
124125
None => tracing::error!("Failed to deserialize web message"),
125126
},
126-
UiEvent::InitFailed(error) => {
127-
tracing::error!("UI initialization failed: {error}");
127+
UiEvent::Failure(error) => {
128+
tracing::error!("UI failure: {error}");
128129
scheduler.schedule(AppEvent::UiCrashed);
129130
}
130131
UiEvent::Crashed => scheduler.schedule(AppEvent::UiCrashed),

desktop/ui/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ authors.workspace = true
66
license.workspace = true
77
edition.workspace = true
88

9-
109
[features]
1110
default = []
1211
embedded_resources = ["dep:graphite-desktop-embedded-resources"]

desktop/ui/src/frames/resample.wgsl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ fn fs_main(in: VertexOutput) -> @location(0) vec4<f32> {
4444
let nearest = floor(sample_pos - 0.5) + 0.5;
4545
let t = sample_pos - nearest;
4646

47+
// Catmull-Rom spline interpolation based sampeling
48+
// See https://gist.github.com/TheRealMJP/c83b8c0f46b63f3a88a5986f4fa982b1
49+
4750
let weight_before = t * (-0.5 + t * (1.0 - 0.5 * t));
4851
let weight_nearest = 1.0 + t * t * (-2.5 + 1.5 * t);
4952
let weight_next = t * (0.5 + t * (2.0 - 1.5 * t));

desktop/ui/src/ipc.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// TODO: Consider inlining this file into internal as it is no longer use outside
2+
13
use cef::{Frame, ImplBinaryValue, ImplFrame, ImplListValue, ImplProcessMessage, ImplV8Context, ProcessId, V8Context, sys::cef_process_id_t};
24

35
pub(crate) enum MessageType {

desktop/ui/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ pub enum UiEvent {
233233
Frame(wgpu::Texture),
234234
Cursor(Cursor),
235235
Message(Vec<u8>),
236-
InitFailed(String),
236+
Failure(String),
237237
Crashed,
238238
}
239239

desktop/ui/src/remote/spawn.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ fn handle_message(
367367
EventMessage::InitFailed(e) => {
368368
tracing::error!("CEF initialization failed in the host process: {e}");
369369
died_reported.store(true, Ordering::SeqCst);
370-
events.terminate(UiEvent::InitFailed(e.to_string()));
370+
events.terminate(UiEvent::Failure(e.to_string()));
371371
}
372372
EventMessage::WebCommunicationInitialized => events.send(UiEvent::Ready),
373373
EventMessage::WebMessage(message) => events.send(UiEvent::Message(message)),

0 commit comments

Comments
 (0)