diff options
Diffstat (limited to 'src/QuickMedia.cpp')
| -rw-r--r-- | src/QuickMedia.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/QuickMedia.cpp b/src/QuickMedia.cpp index 5a3932e..1f7629e 100644 --- a/src/QuickMedia.cpp +++ b/src/QuickMedia.cpp @@ -3875,8 +3875,8 @@ namespace QuickMedia { ImageControl image_control; - const float captcha_slide_padding_x = std::floor(4.0f * get_config().scale); - const float captcha_slide_padding_y = std::floor(4.0f * get_config().scale); + const float captcha_slide_padding_x = std::floor(4.0f * get_config().scale * get_config().spacing_scale); + const float captcha_slide_padding_y = std::floor(4.0f * get_config().scale * get_config().spacing_scale); mgl::Color background_color_darker = get_theme().background_color; background_color_darker.r = std::max(0, (int)background_color_darker.r - 20); background_color_darker.g = std::max(0, (int)background_color_darker.g - 20); @@ -3999,13 +3999,13 @@ namespace QuickMedia { bool sprite_applied_texture = false; std::shared_ptr<ThumbnailData> file_to_upload_thumbnail_data; - const float logo_file_to_upload_spacing = std::floor(10.0f * get_config().scale); + const float logo_file_to_upload_spacing = std::floor(10.0f * get_config().scale * get_config().spacing_scale); float prev_chat_height = comment_input.get_height(); float chat_input_height_full = 0.0f; - const float logo_padding_x = std::floor(15.0f * get_config().scale); - const float chat_input_padding_x = std::floor(10.0f * get_config().scale); - const float chat_input_padding_y = std::floor(10.0f * get_config().scale); + const float logo_padding_x = std::floor(15.0f * get_config().scale * get_config().spacing_scale); + const float chat_input_padding_x = std::floor(10.0f * get_config().scale * get_config().spacing_scale); + const float chat_input_padding_y = std::floor(10.0f * get_config().scale * get_config().spacing_scale); mgl::vec2f body_pos; mgl::vec2f body_size; @@ -4598,9 +4598,9 @@ namespace QuickMedia { inputs[i]->onTextSubmitCallback = text_submit_callback; } inputs[focused_input]->caret_visible = true; - const float padding_x = std::floor(20.0f * get_config().scale); - const float padding_y = std::floor(20.0f * get_config().scale); - const float spacing_y = std::floor(20.0f * get_config().scale); + const float padding_x = std::floor(20.0f * get_config().scale * get_config().spacing_scale); + const float padding_y = std::floor(20.0f * get_config().scale * get_config().spacing_scale); + const float spacing_y = std::floor(20.0f * get_config().scale * get_config().spacing_scale); mgl::vec2f body_pos; mgl::vec2f body_size; @@ -5745,9 +5745,9 @@ namespace QuickMedia { float prev_chat_height = chat_input.get_height(); float chat_input_height_full = 0.0f; - const float logo_padding_x = std::floor(10.0f * get_config().scale); - const float chat_input_padding_x = std::floor(10.0f * get_config().scale); - const float chat_input_padding_y = std::floor(10.0f * get_config().scale); + const float logo_padding_x = std::floor(10.0f * get_config().scale * get_config().spacing_scale); + const float chat_input_padding_x = std::floor(10.0f * get_config().scale * get_config().spacing_scale); + const float chat_input_padding_y = std::floor(10.0f * get_config().scale * get_config().spacing_scale); bool avatar_applied = false; @@ -6798,7 +6798,7 @@ namespace QuickMedia { overlay.set_color(mgl::Color(0, 0, 0, 240)); window.draw(overlay); - const float padding_x = std::floor(10.0f * get_config().scale); + const float padding_x = std::floor(10.0f * get_config().scale * get_config().spacing_scale); mgl::vec2f body_item_pos(body_pos.x + padding_x, window_size.y - chat_input_height_full - item_height); mgl::vec2f body_item_size(body_size.x - padding_x * 2.0f, item_height); @@ -7274,13 +7274,13 @@ namespace QuickMedia { window.clear(get_theme().background_color); window.display(); - const float loading_bar_padding_x = std::floor(4.0f * get_config().scale); - const float loading_bar_padding_y = std::floor(4.0f * get_config().scale); + const float loading_bar_padding_x = std::floor(4.0f * get_config().scale * get_config().spacing_scale); + const float loading_bar_padding_y = std::floor(4.0f * get_config().scale * get_config().spacing_scale); RoundedRectangle loading_bar_background(mgl::vec2f(1.0f, 1.0f), std::floor(10.0f * get_config().scale), get_theme().background_color, &rounded_rectangle_shader); RoundedRectangle loading_bar(mgl::vec2f(1.0f, 1.0f), std::floor(10.0f * get_config().scale - loading_bar_padding_y), get_theme().loading_bar_color, &rounded_rectangle_shader); - const float padding_x = std::floor(30.0f * get_config().scale); - const float spacing_y = std::floor(15.0f * get_config().scale); + const float padding_x = std::floor(30.0f * get_config().scale * get_config().spacing_scale); + const float spacing_y = std::floor(15.0f * get_config().scale * get_config().spacing_scale); const float loading_bar_height = std::floor(20.0f * get_config().scale); mgl::Text progress_text("0kb/Unknown", *FontLoader::get_font(FontLoader::FontType::LATIN, 20.0f * get_config().scale * get_config().font_scale)); @@ -7470,8 +7470,8 @@ namespace QuickMedia { idle_active_handler(); }; - const float bottom_panel_padding = 10.0f; - const float bottom_panel_spacing = 10.0f; + const float bottom_panel_padding = std::floor(10.0f * get_config().spacing_scale); + const float bottom_panel_spacing = std::floor(10.0f * get_config().spacing_scale); Button cancel_button("Cancel", FontLoader::get_font(FontLoader::FontType::LATIN, 16 * get_config().scale), 100.0f, &rounded_rectangle_shader, get_config().scale * get_config().font_scale); cancel_button.set_background_color(get_theme().cancel_button_background_color); |