From 532a57092324ee75c59aab77d3ed2edc51e1043f Mon Sep 17 00:00:00 2001 From: Pfauenauge Date: Tue, 30 Apr 2019 13:49:29 +0200 Subject: [PATCH] rebase Former-commit-id: b3eef84c3a76629e399827e12327556b4c8c7ffa --- voxygen/src/hud/mod.rs | 201 ++++++----------------------------------- 1 file changed, 28 insertions(+), 173 deletions(-) diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs index 999ba664e9..7bdb483e45 100644 --- a/voxygen/src/hud/mod.rs +++ b/voxygen/src/hud/mod.rs @@ -176,6 +176,7 @@ pub(self) struct Imgs { inv_slot: ImgId, // Buttons + mmap_closed: ImgId, mmap_closed_hover: ImgId, mmap_closed_press: ImgId, @@ -220,7 +221,7 @@ pub(self) struct Imgs { button_dark_press: ImgId, // MiniMap - mmap_frame: ImgId, + mmap_frame: ImgId, mmap_frame_closed: ImgId, // SkillBar Module @@ -340,7 +341,7 @@ impl Imgs { mmap_open: load_vox("element/buttons/button_mmap_open.vox", ui), mmap_open_hover: load_vox("element/buttons/button_mmap_open_hover.vox", ui), mmap_open_press: load_vox("element/buttons/button_mmap_open_press.vox", ui), - + settings: load_vox("element/buttons/settings.vox", ui), settings_hover: load_vox("element/buttons/settings_hover.vox", ui), settings_press: load_vox("element/buttons/settings_press.vox", ui), @@ -383,7 +384,7 @@ impl Imgs { button_dark_press: load_img("element/buttons/button_dark_press.png", ui), // MiniMap - mmap_frame: load_vox("element/frames/mmap.vox", ui), + mmap_frame: load_vox("element/frames/mmap.vox", ui), mmap_frame_closed: load_vox("element/frames/mmap_closed.vox", ui), // Skillbar Module @@ -658,46 +659,35 @@ impl Hud { }; } - // Minimap + // Minimap - if self.mmap_open { + if self.mmap_open { Image::new(self.imgs.mmap_frame) - .w_h(100.0 * 2.0, 100.0 * 2.0) - .top_right_with_margins_on(ui_widgets.window, 5.0, 5.0) - .set(self.ids.mmap_frame, ui_widgets); + .w_h(100.0 * 2.0, 100.0 * 2.0) + .top_right_with_margins_on(ui_widgets.window, 5.0, 5.0) + .set(self.ids.mmap_frame, ui_widgets); - Rectangle::fill_with([92.0 * 2.0, 82.0 * 2.0], color::TRANSPARENT) - .mid_top_with_margin_on(self.ids.mmap_frame, 13.0 * 2.0 + 2.0) - .set(self.ids.mmap_frame_bg, ui_widgets); - } else { - Image::new(self.imgs.mmap_frame_closed) + Rectangle::fill_with([92.0 * 2.0, 82.0 * 2.0], color::TRANSPARENT) + .mid_top_with_margin_on(self.ids.mmap_frame, 13.0 * 2.0 + 2.0) + .set(self.ids.mmap_frame_bg, ui_widgets); + } + else { + Image::new(self.imgs.mmap_frame_closed) .w_h(100.0 * 2.0, 11.0 * 2.0) .top_right_with_margins_on(ui_widgets.window, 5.0, 5.0) - .set(self.ids.mmap_frame, ui_widgets); - }; - - if Button::image(if self.mmap_open { - self.imgs.mmap_open - } else { - self.imgs.mmap_closed - }) - .w_h(100.0 * 0.2, 100.0 * 0.2) - .hover_image(if self.mmap_open { - self.imgs.mmap_open_hover - } else { - self.imgs.mmap_closed_hover - }) - .press_image(if self.mmap_open { - self.imgs.mmap_open_press - } else { - self.imgs.mmap_closed_press - }) - .top_right_with_margins_on(self.ids.mmap_frame, 0.0, 0.0) - .set(self.ids.mmap_button, ui_widgets) - .was_clicked() - { - self.mmap_open = !self.mmap_open; - }; + .set(self.ids.mmap_frame, ui_widgets); + }; + + if Button::image(if self.mmap_open {self.imgs.mmap_open} else {self.imgs.mmap_closed}) + .w_h(100.0 * 0.2, 100.0 * 0.2) + .hover_image(if self.mmap_open {self.imgs.mmap_open_hover} else {self.imgs.mmap_closed_hover}) + .press_image(if self.mmap_open {self.imgs.mmap_open_press} else {self.imgs.mmap_closed_press}) + .top_right_with_margins_on(self.ids.mmap_frame, 0.0, 0.0) + .set(self.ids.mmap_button, ui_widgets) + .was_clicked() + { + self.mmap_open = !self.mmap_open; + }; // Title // Make it display the actual location @@ -1068,38 +1058,17 @@ impl Hud { .top_left_with_margins_on(self.ids.settings_bg, 0.0, 0.0) .w_h(412.0, 488.0) .set(self.ids.settings_l, ui_widgets); -<<<<<<< HEAD -<<<<<<< HEAD - Image::new(self.imgs.settings_frame_r) -======= - Image::new(self.imgs.settings_frame_r) ->>>>>>> settings window - .right_from(self.ids.settings_l, 0.0) - .parent(self.ids.settings_bg) - .w_h(412.0, 488.0) - .set(self.ids.settings_r, ui_widgets); - // Content Alignment - Rectangle::fill_with([198.0 * 4.0, 97.0 * 4.0], color::TRANSPARENT) - .top_right_with_margins_on(self.ids.settings_r, 21.0 * 4.0, 4.0 * 4.0) - .scroll_kids() - .scroll_kids_vertically() - .set(self.ids.settings_content, ui_widgets); -======= Image::new(self.imgs.settings_frame_r) .right_from(self.ids.settings_l, 0.0) .parent(self.ids.settings_bg) .w_h(412.0, 488.0) .set(self.ids.settings_r, ui_widgets); -<<<<<<< HEAD ->>>>>>> Map Window, Settings Window -======= // Content Alignment Rectangle::fill_with([198.0*4.0, 97.0*4.0], color::TRANSPARENT) .top_right_with_margins_on(self.ids.settings_r, 21.0*4.0, 4.0*4.0) .scroll_kids() .scroll_kids_vertically() .set(self.ids.settings_content, ui_widgets); ->>>>>>> settings window // X-Button if Button::image(self.imgs.close_button) .w_h(28.0, 28.0) @@ -1121,41 +1090,14 @@ impl Hud { .set(self.ids.settings_title, ui_widgets); // Icon //Image::new(self.imgs.settings_icon) -<<<<<<< HEAD - //.w_h(224.0 / 3.0, 224.0 / 3.0) - //.top_left_with_margins_on(self.ids.settings_bg, -10.0, -10.0) - //.set(self.ids.settings_icon, ui_widgets); -======= //.w_h(224.0 / 3.0, 224.0 / 3.0) //.top_left_with_margins_on(self.ids.settings_bg, -10.0, -10.0) //.set(self.ids.settings_icon, ui_widgets); -<<<<<<< HEAD ->>>>>>> Map Window, Settings Window - // TODO: Find out if we can remove this -======= // TODO: Find out if we can remove this ->>>>>>> settings window // 1 Interface//////////////////////////// if Button::image(if let SettingsTab::Interface = self.settings_tab { self.imgs.settings_button_pressed -<<<<<<< HEAD - } else { - self.imgs.settings_button - }) - .w_h(31.0 * 4.0, 12.0 * 4.0) - .hover_image(if let SettingsTab::Interface = self.settings_tab { - self.imgs.settings_button_pressed - } else { - self.imgs.settings_button_hover - }) - .press_image(if let SettingsTab::Interface = self.settings_tab { - self.imgs.settings_button_pressed - } else { - self.imgs.settings_button_press - }) - .top_left_with_margins_on(self.ids.settings_l, 8.0 * 4.0, 2.0 * 4.0) -======= } else { self.imgs.settings_button }) @@ -1171,7 +1113,6 @@ impl Hud { self.imgs.settings_button_press }) .top_left_with_margins_on(self.ids.settings_l, 8.0*4.0, 2.0*4.0) ->>>>>>> settings window .label("Interface") .label_font_size(14) .label_color(TEXT_COLOR) @@ -1234,28 +1175,11 @@ impl Hud { } // 2 Gameplay//////////////// -<<<<<<< HEAD - if Button::image(if let SettingsTab::Gameplay = self.settings_tab { -======= if Button::image(if let SettingsTab::Gameplay = self.settings_tab { ->>>>>>> settings window self.imgs.settings_button_pressed } else { self.imgs.settings_button }) -<<<<<<< HEAD - .w_h(31.0 * 4.0, 12.0 * 4.0) - .hover_image(if let SettingsTab::Gameplay = self.settings_tab { - self.imgs.settings_button_pressed - } else { - self.imgs.settings_button_hover - }) - .press_image(if let SettingsTab::Gameplay = self.settings_tab { - self.imgs.settings_button_pressed - } else { - self.imgs.settings_button_press - }) -======= .w_h(31.0*4.0, 12.0*4.0) .hover_image(if let SettingsTab::Gameplay = self.settings_tab { self.imgs.settings_button_pressed @@ -1267,7 +1191,6 @@ impl Hud { } else { self.imgs.settings_button_press }) ->>>>>>> settings window .right_from(self.ids.interface, 0.0) .label("Gameplay") .label_font_size(14) @@ -1284,11 +1207,7 @@ impl Hud { } else { self.imgs.settings_button }) -<<<<<<< HEAD - .w_h(31.0 * 4.0, 12.0 * 4.0) -======= .w_h(31.0*4.0, 12.0*4.0) ->>>>>>> settings window .hover_image(if let SettingsTab::Controls = self.settings_tab { self.imgs.settings_button_pressed } else { @@ -1310,28 +1229,11 @@ impl Hud { } // 4 Video//////////////////////////////// -<<<<<<< HEAD - if Button::image(if let SettingsTab::Video = self.settings_tab { -======= if Button::image(if let SettingsTab::Video = self.settings_tab { ->>>>>>> settings window self.imgs.settings_button_pressed } else { self.imgs.settings_button }) -<<<<<<< HEAD - .w_h(31.0 * 4.0, 12.0 * 4.0) - .hover_image(if let SettingsTab::Video = self.settings_tab { - self.imgs.settings_button_pressed - } else { - self.imgs.settings_button_hover - }) - .press_image(if let SettingsTab::Video = self.settings_tab { - self.imgs.settings_button_pressed - } else { - self.imgs.settings_button_press - }) -======= .w_h(31.0*4.0, 12.0*4.0) .hover_image(if let SettingsTab::Video = self.settings_tab { self.imgs.settings_button_pressed @@ -1343,7 +1245,6 @@ impl Hud { } else { self.imgs.settings_button_press }) ->>>>>>> settings window .right_from(self.ids.controls, 0.0) .label("Video") .parent(self.ids.settings_r) @@ -1358,22 +1259,6 @@ impl Hud { // 5 Sound/////////////////////////////// if Button::image(if let SettingsTab::Sound = self.settings_tab { self.imgs.settings_button_pressed -<<<<<<< HEAD - } else { - self.imgs.settings_button - }) - .w_h(31.0 * 4.0, 12.0 * 4.0) - .hover_image(if let SettingsTab::Sound = self.settings_tab { - self.imgs.settings_button_pressed - } else { - self.imgs.settings_button_hover - }) - .press_image(if let SettingsTab::Sound = self.settings_tab { - self.imgs.settings_button_pressed - } else { - self.imgs.settings_button_press - }) -======= } else { self.imgs.settings_button }) @@ -1388,7 +1273,6 @@ impl Hud { } else { self.imgs.settings_button_press }) ->>>>>>> settings window .right_from(self.ids.video, 0.0) .parent(self.ids.settings_r) .label("Sound") @@ -1682,11 +1566,7 @@ impl Hud { // 2 Map if self.map_open { -<<<<<<< HEAD - // BG -======= // BG ->>>>>>> Map Window, Settings Window Rectangle::fill_with([824.0, 976.0], color::TRANSPARENT) .mid_top_with_margin_on(ui_widgets.window, 15.0) .scroll_kids() @@ -1698,8 +1578,6 @@ impl Hud { .w_h(412.0, 488.0) .set(self.ids.map_frame_l, ui_widgets); Image::new(self.imgs.map_frame_r) -<<<<<<< HEAD -<<<<<<< HEAD .right_from(self.ids.map_frame_l, 0.0) .w_h(412.0, 488.0) .set(self.ids.map_frame_r, ui_widgets); @@ -1707,27 +1585,11 @@ impl Hud { .down_from(self.ids.map_frame_r, 0.0) .w_h(412.0, 488.0) .set(self.ids.map_frame_br, ui_widgets); - Image::new(self.imgs.map_frame_bl) - .down_from(self.ids.map_frame_l, 0.0) - .w_h(412.0, 488.0) - .set(self.ids.map_frame_bl, ui_widgets); -======= - .top_right_with_margins_on(self.ids.map_bg, 0.0, 0.0) -======= - .right_from(self.ids.map_frame_l, 0.0) ->>>>>>> settings window - .w_h(412.0, 488.0) - .set(self.ids.map_frame_r, ui_widgets); - Image::new(self.imgs.map_frame_br) - .down_from(self.ids.map_frame_r, 0.0) - .w_h(412.0, 488.0) - .set(self.ids.map_frame_br, ui_widgets); Image::new(self.imgs.map_frame_bl) .down_from(self.ids.map_frame_l, 0.0) .w_h(412.0, 488.0) .set(self.ids.map_frame_bl, ui_widgets); ->>>>>>> Map Window, Settings Window // Icon Image::new(self.imgs.map_icon) @@ -1748,17 +1610,10 @@ impl Hud { } // Title //Text::new("Map") -<<<<<<< HEAD - //.mid_top_with_margin_on(self.ids.map_bg, -7.0) - //.font_size(14) - //.color(TEXT_COLOR) - //.set(self.ids.map_title, ui_widgets); -======= //.mid_top_with_margin_on(self.ids.map_bg, -7.0) //.font_size(14) //.color(TEXT_COLOR) //.set(self.ids.map_title, ui_widgets); ->>>>>>> Map Window, Settings Window } // ESC-MENU