From 6aa7913ab266946c16832793adf8f791697e947d Mon Sep 17 00:00:00 2001 From: Monty Marz Date: Sat, 18 Jan 2020 15:42:21 +0000 Subject: [PATCH] create character button position change --- CHANGELOG.md | 1 + .../element/frames/selection_hover.vox | Bin 0 -> 66532 bytes .../element/frames/selection_press.vox | Bin 0 -> 66532 bytes voxygen/src/menu/char_selection/ui.rs | 69 ++++++++---------- 4 files changed, 32 insertions(+), 38 deletions(-) create mode 100644 assets/voxygen/element/frames/selection_hover.vox create mode 100644 assets/voxygen/element/frames/selection_press.vox diff --git a/CHANGELOG.md b/CHANGELOG.md index e77e82627b..c1fcba052f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -55,6 +55,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Fixed not being able to unmount - Fixed non-humanoids being able to climb and glide - Made shadows and lights use interpolated positions +- Changed "Create Character" button position ### Removed diff --git a/assets/voxygen/element/frames/selection_hover.vox b/assets/voxygen/element/frames/selection_hover.vox new file mode 100644 index 0000000000000000000000000000000000000000..846a547146b17baa92409012a45d06f0b84b2ac6 GIT binary patch literal 66532 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 literal 0 HcmV?d00001 diff --git a/assets/voxygen/element/frames/selection_press.vox b/assets/voxygen/element/frames/selection_press.vox new file mode 100644 index 0000000000000000000000000000000000000000..4be313f42db21a1efe60e12b9e8112d9b7b83bd7 GIT binary patch literal 66532 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 literal 0 HcmV?d00001 diff --git a/voxygen/src/menu/char_selection/ui.rs b/voxygen/src/menu/char_selection/ui.rs index 49cb38dd73..a0bab3aa5b 100644 --- a/voxygen/src/menu/char_selection/ui.rs +++ b/voxygen/src/menu/char_selection/ui.rs @@ -165,6 +165,8 @@ image_ids! { charlist_frame: "voxygen.element.frames.window_4", server_frame: "voxygen.element.frames.server_frame", selection: "voxygen.element.frames.selection", + selection_hover: "voxygen.element.frames.selection_hover", + selection_press: "voxygen.element.frames.selection_press", slider_range: "voxygen.element.slider.track", slider_indicator: "voxygen.element.slider.indicator", @@ -462,7 +464,7 @@ impl CharSelectionUi { } // Create Character Button. - if Button::image(self.imgs.button) + /*if Button::image(self.imgs.button) .mid_bottom_with_margin_on(self.ids.charlist_bg, -60.0) .w_h(270.0, 50.0) .hover_image(self.imgs.button_hover) @@ -477,7 +479,7 @@ impl CharSelectionUi { { self.character_creation = true; self.character_tool = Some(STARTER_SWORD); - } + }*/ // Alpha Version Text::new(&version) @@ -511,7 +513,7 @@ impl CharSelectionUi { self.info_content = InfoContent::Deletion; self.info_window = true; } - Text::new("Human Default") + Text::new("Test Character") .top_left_with_margins_on(self.ids.character_box_1, 6.0, 9.0) .font_size(19) .font_id(self.fonts.cyri) @@ -532,37 +534,22 @@ impl CharSelectionUi { .color(TEXT_COLOR) .set(self.ids.character_location_1, ui_widgets); - // 2nd Character in List - if Button::image(self.imgs.nothing) + // Create Character Button + if Button::image(self.imgs.selection) .down_from(self.ids.character_box_1, 5.0) .w_h(386.0, 80.0) - .hover_image(self.imgs.selection) - .press_image(self.imgs.selection) - .image_color(Color::Rgba(1.0, 1.0, 1.0, 0.8)) - .label_y(conrod_core::position::Relative::Scalar(20.0)) + .hover_image(self.imgs.selection_hover) + .press_image(self.imgs.selection_press) + .label("Create New Character") + .label_color(Color::Rgba(0.38, 1.0, 0.07, 1.0)) + .label_font_id(self.fonts.cyri) + .image_color(Color::Rgba(0.38, 1.0, 0.07, 1.0)) .set(self.ids.character_box_2, ui_widgets) .was_clicked() - {} - Text::new("Example 2nd Char") - .top_left_with_margins_on(self.ids.character_box_2, 6.0, 9.0) - .font_size(19) - .font_id(self.fonts.cyri) - .color(TEXT_COLOR) - .set(self.ids.character_name_2, ui_widgets); - - Text::new("Level ??") - .down_from(self.ids.character_name_2, 4.0) - .font_size(17) - .font_id(self.fonts.cyri) - .color(TEXT_COLOR) - .set(self.ids.character_level_2, ui_widgets); - - Text::new("Plains of Uncertainty") - .down_from(self.ids.character_level_2, 4.0) - .font_size(17) - .font_id(self.fonts.cyri) - .color(TEXT_COLOR) - .set(self.ids.character_location_2, ui_widgets); + { + self.character_creation = true; + self.character_tool = Some(STARTER_SWORD); + } } // Character_Creation ////////////////////////////////////////////////////////////////////// else { @@ -629,17 +616,23 @@ impl CharSelectionUi { } // Window - Rectangle::fill_with([386.0, 988.0], color::rgba(0.0, 0.0, 0.0, 0.8)) - .top_left_with_margins_on(ui_widgets.window, 30.0, 30.0) - .set(self.ids.creation_bg, ui_widgets); + Rectangle::fill_with( + [386.0, ui_widgets.win_h - ui_widgets.win_h * 0.2], + color::rgba(0.0, 0.0, 0.0, 0.8), + ) + .top_left_with_margins_on(ui_widgets.window, 30.0, 30.0) + .set(self.ids.creation_bg, ui_widgets); Image::new(self.imgs.charlist_frame) - .w_h(400.0, 1000.0) + .w_h(400.0, ui_widgets.win_h - ui_widgets.win_h * 0.19) .middle_of(self.ids.creation_bg) .set(self.ids.charlist_frame, ui_widgets); - Rectangle::fill_with([386.0, 983.0], color::TRANSPARENT) - .middle_of(self.ids.creation_bg) - .scroll_kids_vertically() - .set(self.ids.creation_alignment, ui_widgets); + Rectangle::fill_with( + [386.0, ui_widgets.win_h - ui_widgets.win_h * 0.19], + color::TRANSPARENT, + ) + .middle_of(self.ids.creation_bg) + .scroll_kids_vertically() + .set(self.ids.creation_alignment, ui_widgets); Scrollbar::y_axis(self.ids.creation_alignment) .thickness(5.0) .auto_hide(true)