aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/input/mod.rs2
-rw-r--r--src/layout/mod.rs4
-rw-r--r--src/tests/client.rs6
-rw-r--r--src/tests/fixture.rs2
-rw-r--r--src/tests/window_opening.rs4
-rw-r--r--src/window/mapped.rs2
6 files changed, 10 insertions, 10 deletions
diff --git a/src/input/mod.rs b/src/input/mod.rs
index 2604fd72..aea4b409 100644
--- a/src/input/mod.rs
+++ b/src/input/mod.rs
@@ -2973,7 +2973,7 @@ fn should_intercept_key(
}
}
(_, false) => {
- // By this point, we know that the key was supressed on press. Even if we're inhibiting
+ // By this point, we know that the key was suppressed on press. Even if we're inhibiting
// shortcuts, we should still suppress the release.
// But we don't need to check for shortcuts inhibition here, because
// if it was inhibited on press (forwarded to the client), it wouldn't be suppressed,
diff --git a/src/layout/mod.rs b/src/layout/mod.rs
index 264bb298..683592b2 100644
--- a/src/layout/mod.rs
+++ b/src/layout/mod.rs
@@ -3077,7 +3077,7 @@ impl<W: LayoutElement> Layout<W> {
target.previous_workspace_id = Some(target.workspaces[target.active_workspace_idx].id());
if target.options.empty_workspace_above_first && target.workspaces.len() == 1 {
- // Insert a new empty workspace on top to prepare for insertion of new workspce.
+ // Insert a new empty workspace on top to prepare for insertion of new workspace.
target.add_workspace_top();
}
// Insert the workspace after the currently active one. Unless the currently active one is
@@ -3159,7 +3159,7 @@ impl<W: LayoutElement> Layout<W> {
target.previous_workspace_id = Some(target.workspaces[target.active_workspace_idx].id());
if target.options.empty_workspace_above_first && target.workspaces.len() == 1 {
- // Insert a new empty workspace on top to prepare for insertion of new workspce.
+ // Insert a new empty workspace on top to prepare for insertion of new workspace.
target.add_workspace_top();
}
// Insert the workspace after the currently active one. Unless the currently active one is
diff --git a/src/tests/client.rs b/src/tests/client.rs
index 531db72c..fff435c1 100644
--- a/src/tests/client.rs
+++ b/src/tests/client.rs
@@ -62,7 +62,7 @@ pub struct Window {
pub viewport: WpViewport,
pub pending_configure: Configure,
pub configures_received: Vec<(u32, Configure)>,
- pub close_requsted: bool,
+ pub close_requested: bool,
pub configures_looked_at: usize,
}
@@ -194,7 +194,7 @@ impl State {
viewport,
pending_configure: Configure::default(),
configures_received: Vec::new(),
- close_requsted: false,
+ close_requested: false,
configures_looked_at: 0,
};
@@ -459,7 +459,7 @@ impl Dispatch<XdgToplevel, ()> for State {
.collect();
}
xdg_toplevel::Event::Close => {
- window.close_requsted = true;
+ window.close_requested = true;
}
xdg_toplevel::Event::ConfigureBounds { width, height } => {
window.pending_configure.bounds = Some((width, height));
diff --git a/src/tests/fixture.rs b/src/tests/fixture.rs
index f7bef77d..1ae9c656 100644
--- a/src/tests/fixture.rs
+++ b/src/tests/fixture.rs
@@ -125,7 +125,7 @@ impl Fixture {
}
}
- /// Rountrip twice in a row.
+ /// Roundtrip twice in a row.
///
/// For some reason, when running tests on many threads at once, a single roundtrip is
/// sometimes not sufficient to get the configure events to the client.
diff --git a/src/tests/window_opening.rs b/src/tests/window_opening.rs
index d1877ac7..17b8d420 100644
--- a/src/tests/window_opening.rs
+++ b/src/tests/window_opening.rs
@@ -339,7 +339,7 @@ window-rule {{
window.ack_last_and_commit();
f.double_roundtrip(id);
- // Commit to the post-intial configures.
+ // Commit to the post-initial configures.
let window = f.client(id).window(&surface);
let new_serial = window.configures_received.last().unwrap().0;
if new_serial != serial {
@@ -582,7 +582,7 @@ window-rule {
window.ack_last_and_commit();
f.double_roundtrip(id);
- // Commit to the post-intial configures.
+ // Commit to the post-initial configures.
let window = f.client(id).window(&surface);
let new_serial = window.configures_received.last().unwrap().0;
if new_serial != serial {
diff --git a/src/window/mapped.rs b/src/window/mapped.rs
index 71b6c9da..83a6360d 100644
--- a/src/window/mapped.rs
+++ b/src/window/mapped.rs
@@ -778,7 +778,7 @@ impl LayoutElement for Mapped {
let _span =
trace_span!("send_pending_configure", surface = ?toplevel.wl_surface().id()).entered();
- // Check for pending changes manually to account fo RequestSizeOnce::UseWindowSize.
+ // Check for pending changes manually to account for RequestSizeOnce::UseWindowSize.
let has_pending_changes = with_toplevel_role(self.toplevel(), |role| {
if role.server_pending.is_none() {
return false;