positioning

Former-commit-id: d599e046d1944a41eef5423cf3bb0f17f42a246a
This commit is contained in:
Pfauenauge 2019-05-06 20:28:08 +02:00 committed by Imbris
parent 87e75644ec
commit b7b3c5f3cd
3 changed files with 5 additions and 5 deletions

View File

@ -86,7 +86,7 @@ impl<'a> Widget for CharacterWindow<'a> {
Image::new(self.imgs.window_frame)
.middle_of(id)
.top_left_with_margins_on(ui.window, 200.0, 215.0)
.w_h(1648.0 / 4.0, 1952.0 / 4.0)
.w_h(107.0*4.0, 125.0*4.0)
.set(state.charwindow_frame, ui);
// Icon
@ -100,7 +100,7 @@ impl<'a> Widget for CharacterWindow<'a> {
.w_h(28.0, 28.0)
.hover_image(self.imgs.close_button_hover)
.press_image(self.imgs.close_button_press)
.top_right_with_margins_on(state.charwindow_frame, 12.0, 4.0)
.top_right_with_margins_on(state.charwindow_frame, 12.0, 0.0)
.set(state.charwindow_close, ui)
.was_clicked() {
return Some(Event::Close);

View File

@ -112,7 +112,7 @@ pub struct Show {
open_windows: Windows,
map: bool,
inventory_test_button: bool,
mini_map: bool,
mini_map: bool,
}
impl Show {
fn toggle_bag(&mut self) {

View File

@ -121,10 +121,10 @@ impl<'a> Widget for SmallWindow<'a> {
// X-Button
if Button::image(self.imgs.close_button)
.w_h(20.0, 20.0)
.w_h(28.0, 28.0)
.hover_image(self.imgs.close_button_hover)
.press_image(self.imgs.close_button_press)
.top_right_with_margins_on(state.ids.frame, 17.0, 5.0)
.top_right_with_margins_on(state.ids.frame, 12.0, 0.0)
.set(state.ids.close, ui)
.was_clicked()
{