This commit is contained in:
Simon Gardling 2023-03-07 16:55:44 -05:00
parent f390102110
commit fbcb611eea
3 changed files with 20 additions and 20 deletions

22
Cargo.lock generated
View File

@ -703,7 +703,7 @@ checksum = "0bd4b30a6560bbd9b4620f4de34c3f14f60848e58a9b7216801afcb4c7b31c3c"
[[package]] [[package]]
name = "ecolor" name = "ecolor"
version = "0.21.0" version = "0.21.0"
source = "git+https://github.com/emilk/egui.git#f94187ab718e8513084e591fcef73356a4971d6b" source = "git+https://github.com/titaniumtown/egui.git#2d9403efdf94e93fc193ab9e909198f47b7398a1"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"serde", "serde",
@ -712,7 +712,7 @@ dependencies = [
[[package]] [[package]]
name = "eframe" name = "eframe"
version = "0.21.3" version = "0.21.3"
source = "git+https://github.com/emilk/egui.git#f94187ab718e8513084e591fcef73356a4971d6b" source = "git+https://github.com/titaniumtown/egui.git#2d9403efdf94e93fc193ab9e909198f47b7398a1"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"egui", "egui",
@ -735,7 +735,7 @@ dependencies = [
[[package]] [[package]]
name = "egui" name = "egui"
version = "0.21.0" version = "0.21.0"
source = "git+https://github.com/emilk/egui.git#f94187ab718e8513084e591fcef73356a4971d6b" source = "git+https://github.com/titaniumtown/egui.git#2d9403efdf94e93fc193ab9e909198f47b7398a1"
dependencies = [ dependencies = [
"accesskit", "accesskit",
"ahash", "ahash",
@ -748,7 +748,7 @@ dependencies = [
[[package]] [[package]]
name = "egui-winit" name = "egui-winit"
version = "0.21.1" version = "0.21.1"
source = "git+https://github.com/emilk/egui.git#f94187ab718e8513084e591fcef73356a4971d6b" source = "git+https://github.com/titaniumtown/egui.git#2d9403efdf94e93fc193ab9e909198f47b7398a1"
dependencies = [ dependencies = [
"android-activity", "android-activity",
"arboard", "arboard",
@ -763,7 +763,7 @@ dependencies = [
[[package]] [[package]]
name = "egui_glow" name = "egui_glow"
version = "0.21.0" version = "0.21.0"
source = "git+https://github.com/emilk/egui.git#f94187ab718e8513084e591fcef73356a4971d6b" source = "git+https://github.com/titaniumtown/egui.git#2d9403efdf94e93fc193ab9e909198f47b7398a1"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"egui", "egui",
@ -783,7 +783,7 @@ checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
[[package]] [[package]]
name = "emath" name = "emath"
version = "0.21.0" version = "0.21.0"
source = "git+https://github.com/emilk/egui.git#f94187ab718e8513084e591fcef73356a4971d6b" source = "git+https://github.com/titaniumtown/egui.git#2d9403efdf94e93fc193ab9e909198f47b7398a1"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"serde", "serde",
@ -803,7 +803,7 @@ dependencies = [
[[package]] [[package]]
name = "epaint" name = "epaint"
version = "0.21.0" version = "0.21.0"
source = "git+https://github.com/emilk/egui.git#f94187ab718e8513084e591fcef73356a4971d6b" source = "git+https://github.com/titaniumtown/egui.git#2d9403efdf94e93fc193ab9e909198f47b7398a1"
dependencies = [ dependencies = [
"ab_glyph", "ab_glyph",
"ahash", "ahash",
@ -2181,9 +2181,9 @@ dependencies = [
[[package]] [[package]]
name = "serde" name = "serde"
version = "1.0.152" version = "1.0.153"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" checksum = "3a382c72b4ba118526e187430bb4963cd6d55051ebf13d9b25574d379cc98d20"
dependencies = [ dependencies = [
"serde_derive", "serde_derive",
] ]
@ -2200,9 +2200,9 @@ dependencies = [
[[package]] [[package]]
name = "serde_derive" name = "serde_derive"
version = "1.0.152" version = "1.0.153"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" checksum = "1ef476a5790f0f6decbc66726b6e5d63680ed518283e64c7df415989d880954f"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",

View File

@ -33,14 +33,14 @@ strip = false
[dependencies] [dependencies]
parsing = { path = "./parsing" } parsing = { path = "./parsing" }
eframe = { git = "https://github.com/emilk/egui.git", default-features = false, features = [ eframe = { git = "https://github.com/titaniumtown/egui.git", default-features = false, features = [
"glow", "glow",
] } ] }
egui = { git = "https://github.com/emilk/egui.git", default-features = false, features = [ egui = { git = "https://github.com/titaniumtown/egui.git", default-features = false, features = [
"serde", "serde",
] } ] }
epaint = { git = "https://github.com/emilk/egui.git", default-features = false } epaint = { git = "https://github.com/titaniumtown/egui.git", default-features = false }
emath = { git = "https://github.com/emilk/egui.git", default-features = false } emath = { git = "https://github.com/titaniumtown/egui.git", default-features = false }
shadow-rs = { version = "0.12", default-features = false } shadow-rs = { version = "0.12", default-features = false }
const_format = { version = "0.2", default-features = false, features = ["fmt"] } const_format = { version = "0.2", default-features = false, features = ["fmt"] }
@ -57,8 +57,8 @@ benchmarks = { path = "./benchmarks" }
[build-dependencies] [build-dependencies]
shadow-rs = "0.12" shadow-rs = "0.12"
epaint = { git = "https://github.com/emilk/egui.git", default-features = false } epaint = { git = "https://github.com/titaniumtown/egui.git", default-features = false }
egui = { git = "https://github.com/emilk/egui.git", default-features = false, features = [ egui = { git = "https://github.com/titaniumtown/egui.git", default-features = false, features = [
"serde", "serde",
] } ] }
bincode = "1.3" bincode = "1.3"

View File

@ -102,14 +102,14 @@ impl FunctionManager {
let re = ui.add_sized( let re = ui.add_sized(
target_size * size_multiplier, target_size * size_multiplier,
egui::TextEdit::singleline(&mut new_string) egui::TextEdit::singleline(&mut new_string)
// .hint_forward(true) // Make the hint appear after the last text in the textbox .hint_forward(true) // Make the hint appear after the last text in the textbox
.lock_focus(true) .lock_focus(true)
.id(te_id) // Set widget's id to `te_id` .id(te_id) // Set widget's id to `te_id`
.hint_text({ .hint_text({
// If there's a single hint, go ahead and apply the hint here, if not, set the hint to an empty string // If there's a single hint, go ahead and apply the hint here, if not, set the hint to an empty string
match function.autocomplete.hint.single() { match function.autocomplete.hint.single() {
Some(single_hint) => function.raw_func_str.clone() + single_hint, Some(single_hint) => single_hint,
None => String::new(), None => "",
} }
}), }),
); );