Skip to content

Commit c4ad16c

Browse files
Atan-D-RP4Atan-D-RP4
authored
Merge branch 'raphamorim:main' into main
2 parents df2bc4c + 8eba9cb commit c4ad16c

7 files changed

Lines changed: 97 additions & 98 deletions

File tree

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
with:
9797
distribution: goreleaser-pro
9898
version: nightly
99-
args: release --clean --split ${{ matrix._ids }}
99+
args: release --clean --split ${{ matrix._ids }} --skip=winget
100100
- if: (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && !startsWith(github.ref, 'refs/tags/v'))) && steps.cache-check.outputs.cache-hit != 'true'
101101
uses: goreleaser/goreleaser-action@v6.3.0
102102
with:

‎Cargo.lock‎

Lines changed: 18 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ members = [
1212
resolver = "2"
1313

1414
[workspace.package]
15-
version = "0.2.18"
15+
version = "0.2.19"
1616
authors = ["Raphael Amorim <rapha850@gmail.com>"]
1717
edition = "2021"
1818
license = "MIT"
1919
keywords = ["graphics", "terminal", "application"]
2020
# Minimal stable rust version (MSRV)
21-
rust-version = "1.85.0"
21+
rust-version = "1.87.0"
2222
repository = "https://github.com/raphamorim/rio"
2323
homepage = "https://raphamorim.io/rio"
2424
documentation = "https://github.com/raphamorim/rio#readme"
@@ -28,17 +28,17 @@ readme = "README.md"
2828
# Note: https://doc.rust-lang.org/cargo/reference/specifying-dependencies.html#multiple-locations
2929
# Sugarloaf example uses path when used locally, but uses
3030
# version from crates.io when published.
31-
teletypewriter = { path = "teletypewriter", version = "0.2.16" }
32-
rio-backend = { path = "rio-backend", version = "0.2.16" }
33-
rio-window = { path = "rio-window", version = "0.2.16", default-features = false }
34-
sugarloaf = { path = "sugarloaf", version = "0.2.16" }
31+
teletypewriter = { path = "teletypewriter", version = "0.2.19" }
32+
rio-backend = { path = "rio-backend", version = "0.2.19" }
33+
rio-window = { path = "rio-window", version = "0.2.19", default-features = false }
34+
sugarloaf = { path = "sugarloaf", version = "0.2.19" }
3535

3636
# Own dependencies
37-
copa = { path = "copa", default-features = true, version = "0.2.16" }
38-
rio-proc-macros = { path = "rio-proc-macros", version = "0.2.16" }
39-
corcovado = { path = "corcovado", version = "0.2.16" }
37+
copa = { path = "copa", default-features = true, version = "0.2.19" }
38+
rio-proc-macros = { path = "rio-proc-macros", version = "0.2.19" }
39+
corcovado = { path = "corcovado", version = "0.2.19" }
4040
raw-window-handle = { version = "0.6.2", features = ["std"] }
41-
parking_lot = { version = "0.12.3", features = [
41+
parking_lot = { version = "0.12.4", features = [
4242
"nightly",
4343
"hardware-lock-elision",
4444
] }
@@ -57,16 +57,16 @@ image_rs = { package = "image", version = "0.25.5", default-features = false, fe
5757
"bmp",
5858
] }
5959
regex = "1.11.1"
60-
bytemuck = { version = "1.22.0", features = ["derive"] }
60+
bytemuck = { version = "1.23.1", features = ["derive"] }
6161
serde = { version = "1.0.219", features = ["derive"] }
6262
wgpu = "25.0.2"
63-
libc = "0.2.171"
63+
libc = "0.2.173"
6464
smol_str = "0.3.2"
6565
futures = "0.3.31"
6666
wasm-bindgen = "0.2.87"
6767
wasm-bindgen-futures = "0.4.34"
6868
wasm-bindgen-test = "0.3.42"
69-
env_logger = "0.11.3"
69+
env_logger = "0.11.8"
7070
console_log = "0.2.2"
7171
bitflags = "2.9.0"
7272
iovec = "0.1.4"
@@ -84,7 +84,7 @@ codegen-units = 1
8484
incremental = false
8585
lto = true # reduces binary size by ~14%
8686
panic = "abort" # reduces binary size by ~50% in combination with -Zbuild-std-features=panic_immediate_abort
87-
# opt-level = "s" # reduces binary size by ~25%
87+
opt-level = "s" # reduces binary size by ~25%
8888

8989
[profile.dev]
9090
split-debuginfo = "unpacked"

‎docs/docs/releases.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ language: 'en'
77

88
## 0.2.19 (unreleased)
99

10+
- Fix: Build for MacOS 26 Tahoe.
1011
- Fix: `Enter`,`Tab`, `Backspace` not disambiguated with `shift` in kitty keyboard's disambiguate mode.
12+
- Fix: line-height adds small gaps for box-drawing characters [#1126](https://github.com/raphamorim/rio/issues/1126).
1113
- Search matching a wrapping fullwidth character in the last column.
1214

1315
## 0.2.18

‎frontends/rioterm/src/renderer/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -900,7 +900,7 @@ impl Renderer {
900900
let content = sugarloaf.content();
901901
match specific_lines {
902902
None => {
903-
let start = std::time::Instant::now();
903+
// let start = std::time::Instant::now();
904904
content.sel(rich_text_id);
905905
content.clear();
906906
for (i, row) in visible_rows.iter().enumerate() {

‎rio-window/src/platform_impl/macos/app_delegate.rs‎

Lines changed: 59 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -164,68 +164,6 @@ declare_class!(
164164
Retained::<NSMenu>::autorelease_return(menubar)
165165
}
166166

167-
#[method(rioCreateWindow:)]
168-
fn create_window(
169-
&self,
170-
_sender: Option<&AnyObject>,
171-
) {
172-
if self.is_launched() {
173-
self.dispatch_create_window_event();
174-
}
175-
}
176-
177-
#[method(copy:)]
178-
fn copy(&self, _sender: Option<&AnyObject>) {
179-
if self.is_launched() {
180-
self.dispatch_hook(Hook::Copy);
181-
}
182-
}
183-
184-
#[method(paste:)]
185-
fn paste(&self, _sender: Option<&AnyObject>) {
186-
if self.is_launched() {
187-
self.dispatch_hook(Hook::Paste);
188-
}
189-
}
190-
191-
#[method(rioCreateTab:)]
192-
fn create_tab(&self, _sender: Option<&AnyObject>) {
193-
if self.is_launched() {
194-
self.dispatch_hook(Hook::CreateTab);
195-
}
196-
}
197-
198-
#[method(rioClose:)]
199-
fn close_tab(&self, _sender: Option<&AnyObject>) {
200-
if self.is_launched() {
201-
self.dispatch_hook(Hook::Close);
202-
}
203-
}
204-
205-
#[method(rioSplitDown:)]
206-
fn split_down(&self, _sender: Option<&AnyObject>) {
207-
if self.is_launched() {
208-
self.dispatch_hook(Hook::SplitDown);
209-
}
210-
}
211-
212-
#[method(rioSplitRight:)]
213-
fn split_right(&self, _sender: Option<&AnyObject>) {
214-
if self.is_launched() {
215-
self.dispatch_hook(Hook::SplitRight);
216-
}
217-
}
218-
219-
#[method(openConfig:)]
220-
fn open_configuration(
221-
&self,
222-
_sender: Option<&AnyObject>,
223-
) {
224-
if self.is_launched() {
225-
self.dispatch_open_configuration();
226-
}
227-
}
228-
229167
#[method(applicationShouldHandleReopen:hasVisibleWindows:)]
230168
fn should_handle_reopen(&self,
231169
_sender: Option<&AnyObject>,
@@ -313,6 +251,65 @@ declare_class!(
313251
trace_scope!("Completed `application:openURLs:`");
314252
}
315253
}
254+
255+
// Custom methods for menu actions
256+
unsafe impl ApplicationDelegate {
257+
#[method(rioCreateWindow:)]
258+
fn create_window(&self, _sender: Option<&AnyObject>) {
259+
if self.is_launched() {
260+
self.dispatch_create_window_event();
261+
}
262+
}
263+
264+
#[method(copy:)]
265+
fn copy(&self, _sender: Option<&AnyObject>) {
266+
if self.is_launched() {
267+
self.dispatch_hook(Hook::Copy);
268+
}
269+
}
270+
271+
#[method(paste:)]
272+
fn paste(&self, _sender: Option<&AnyObject>) {
273+
if self.is_launched() {
274+
self.dispatch_hook(Hook::Paste);
275+
}
276+
}
277+
278+
#[method(rioCreateTab:)]
279+
fn create_tab(&self, _sender: Option<&AnyObject>) {
280+
if self.is_launched() {
281+
self.dispatch_hook(Hook::CreateTab);
282+
}
283+
}
284+
285+
#[method(rioClose:)]
286+
fn close_tab(&self, _sender: Option<&AnyObject>) {
287+
if self.is_launched() {
288+
self.dispatch_hook(Hook::Close);
289+
}
290+
}
291+
292+
#[method(rioSplitDown:)]
293+
fn split_down(&self, _sender: Option<&AnyObject>) {
294+
if self.is_launched() {
295+
self.dispatch_hook(Hook::SplitDown);
296+
}
297+
}
298+
299+
#[method(rioSplitRight:)]
300+
fn split_right(&self, _sender: Option<&AnyObject>) {
301+
if self.is_launched() {
302+
self.dispatch_hook(Hook::SplitRight);
303+
}
304+
}
305+
306+
#[method(openConfig:)]
307+
fn open_configuration(&self, _sender: Option<&AnyObject>) {
308+
if self.is_launched() {
309+
self.dispatch_open_configuration();
310+
}
311+
}
312+
}
316313
);
317314

318315
impl ApplicationDelegate {

‎sugarloaf/src/components/rich_text/compositor.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ impl Compositor {
453453
builtin_character,
454454
color,
455455
depth,
456-
style.line_height_without_mod,
456+
style.line_height,
457457
);
458458
if let Some(cache) = &mut cache_operations {
459459
cache.push(BatchOperation::DrawableChar {
@@ -463,7 +463,7 @@ impl Compositor {
463463
char_type: builtin_character,
464464
color,
465465
depth,
466-
line_height: style.line_height_without_mod,
466+
line_height: style.line_height,
467467
});
468468
}
469469
} else {

0 commit comments

Comments
 (0)