migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-09-02 06:40:06 -04:00
Code Activity

Add Zoom Factor to options panel (#7517)

Browse Source
This commit is contained in:
Emil Ernerfeldt
2025-09-08 18:27:28 +02:00
committed by GitHub
parent b822977e7f
commit 01ee23c1a0
6 changed files with 15 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
crates/egui_demo_lib/src/demo/scrolling.rs
View File

@@ -4,8 +4,9 @@ use egui::{
};
#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
#[derive(Clone, Copy, Debug, PartialEq)]
#[derive(Clone, Copy, Debug, Default, PartialEq)]
enum ScrollDemo {
#[default]
ScrollAppearance,
ScrollTo,
ManyLines,
@@ -14,12 +15,6 @@ enum ScrollDemo {
Bidirectional,
}
impl Default for ScrollDemo {
fn default() -> Self {
Self::ScrollAppearance
}
}
#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
#[cfg_attr(feature = "serde", serde(default))]
#[derive(Default, PartialEq)]

2
crates/egui_demo_lib/src/easy_mark/easy_mark_highlighter.rs
View File

@@ -108,7 +108,7 @@ pub fn highlight_easymark(egui_style: &egui::Style, mut text: &str) -> egui::tex
// Swallow everything up to the next special character:
let line_end = text[skip..]
.find('\n')
.map_or_else(|| text.len(), |i| (skip + i + 1));
.map_or_else(|| text.len(), |i| skip + i + 1);
let end = text[skip..]
.find(&['*', '`', '~', '_', '/', '$', '^', '\\', '<', '['][..])
.map_or_else(|| text.len(), |i| (skip + i).max(1));