Skip to content

Commit df89020

Browse files
committed
add tooltip for flap
1 parent 55e0b5f commit df89020

3 files changed

Lines changed: 12 additions & 6 deletions

File tree

locales/de.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@
3535
"gui.mode.mmc": "MultiMC/PrismLauncher",
3636
"gui.mode.server": "Server",
3737
"gui.ui.show_loader_betas": "Beta-Versionen Anzeigen",
38-
"gui.checkbox.include_flap": "Flap mitliefern",
38+
"gui.checkbox.include_flap": "Flap Mitliefern",
39+
"gui.flap.description": "Flap ermöglicht, Mods für verschiedene Intermediary-Varianten in der selben Instanz zu verwenden (bspw. LegacyFabric- und Ornithe-Mods).",
3940
"client.error.directory_does_not_exist": "Der Ordner %{dir} existiert nicht. Stelle sicher, dass du den richtigen Ordner ausgewählt und dass du das Spiel mindestens einmal vorher gestartet hast.",
4041
"client.info.installation_start": "Installiere client für %{version} mit %{loader} Loader %{loader_version} nach %{destination}",
4142
"client.info.fetching_launch_jsons": "Hole Start-jsons...",

locales/en.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
"gui.mode.server": "Server",
3737
"gui.ui.show_loader_betas": "Show Betas",
3838
"gui.checkbox.include_flap":"Include Flap",
39+
"gui.flap.description": "Flap allows you to run mods compiled for different intermediaries on the same instance (e.g. LegacyFabric and Ornithe).",
3940
"client.error.directory_does_not_exist": "The directory %{dir} does not exist. Make sure you selected the correct folder and that you have started the game at least once before.",
4041
"client.info.installation_start": "Installing client for %{version} using %{loader} Loader %{loader_version} to %{destination}",
4142
"client.info.fetching_launch_jsons": "Fetching launch jsons...",

src/ui/gui.rs

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ use std::{
88

99
use egui::{
1010
Align, Button, Checkbox, Color32, ComboBox, FontId, Frame, Id, Layout, Margin, ProgressBar,
11-
Response, RichText, ScrollArea, Sense, TextEdit, Theme, Ui, UiBuilder, Vec2, Vec2b, Widget,
12-
WidgetText,
11+
Response, RichText, ScrollArea, Sense, TextEdit, Theme, Tooltip, Ui, UiBuilder, Vec2, Vec2b,
12+
Widget, WidgetText,
1313
text::{CCursor, CCursorRange},
1414
};
1515
use log::{error, info};
@@ -685,10 +685,14 @@ impl App {
685685
child.horizontal_centered(|ui| {
686686
let flap_checkbox =
687687
Checkbox::new(&mut self.include_flap, t!("gui.checkbox.include_flap"));
688-
if self.mode == Mode::MMC {
689-
ui.add_sized([ui.available_width() / 6.0, 20.0], flap_checkbox);
688+
let flap_box_response = if self.mode == Mode::MMC {
689+
ui.add_sized([ui.available_width() / 5.0, 20.0], flap_checkbox)
690690
} else {
691-
ui.add(flap_checkbox);
691+
ui.add(flap_checkbox)
692+
};
693+
if flap_box_response.has_focus() || flap_box_response.hovered() {
694+
Tooltip::for_widget(&flap_box_response)
695+
.show(|ui| ui.label(t!("gui.flap.description")));
692696
}
693697
match self.mode {
694698
Mode::Client => {

0 commit comments

Comments
 (0)