diff options
Diffstat (limited to 'src/SearchBar.cpp')
| -rw-r--r-- | src/SearchBar.cpp | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/src/SearchBar.cpp b/src/SearchBar.cpp index 382b06a..6895dcb 100644 --- a/src/SearchBar.cpp +++ b/src/SearchBar.cpp @@ -8,10 +8,13 @@ // TODO: Use a seperate placeholder sf::Text instead of switching the text to placeholder text.... -const sf::Color text_placeholder_color(255, 255, 255, 100); -const sf::Color front_color(55, 60, 68); -const float background_margin_horizontal = 15.0f; -const float PADDING_HORIZONTAL = 25.0f; +static const sf::Color text_placeholder_color(255, 255, 255, 100); +static const sf::Color front_color(55, 60, 68); +static const float background_margin_horizontal = 15.0f; +static const float PADDING_HORIZONTAL = 25.0f; +static const float padding_top = 10.0f; +static const float padding_bottom = 15.0f; +static const float background_margin_vertical = 4.0f; namespace QuickMedia { SearchBar::SearchBar(sf::Font &font, sf::Texture *plugin_logo, const std::string &placeholder, bool input_masked) : @@ -22,8 +25,8 @@ namespace QuickMedia { text_autosearch_delay(0), autocomplete_search_delay(0), caret_visible(true), - text(placeholder, font, 18), - autocomplete_text("", font, 18), + text(placeholder, font, 16), + autocomplete_text("", font, 16), background(sf::Vector2f(1.0f, 1.0f), 10.0f, 10), placeholder_str(placeholder), show_placeholder(true), @@ -127,20 +130,20 @@ namespace QuickMedia { sf::Vector2f texture_size_f(texture_size.x, texture_size.y); sf::Vector2f new_size = wrap_to_size(texture_size_f, sf::Vector2f(200.0f, one_line_height)); plugin_logo_sprite.setScale(get_ratio(texture_size_f, new_size)); - plugin_logo_sprite.setPosition(25.0f, padding_vertical + vertical_pos); + plugin_logo_sprite.setPosition(25.0f, padding_top + vertical_pos); offset_x = 25.0f + new_size.x + 25.0f; } const float width = std::floor(window_size.x - offset_x - padding_horizontal); background.setSize(sf::Vector2f(width, rect_height)); - shade.setSize(sf::Vector2f(window_size.x, padding_vertical + rect_height + padding_vertical)); + shade.setSize(sf::Vector2f(window_size.x, padding_top + rect_height + padding_bottom)); caret.setSize(sf::Vector2f(2.0f, text.getCharacterSize() + 2.0f)); background_shadow.setSize(sf::Vector2f(window_size.x, 5.0f)); - background.setPosition(offset_x, padding_vertical + vertical_pos); + background.setPosition(offset_x, padding_top + vertical_pos); shade.setPosition(0.0f, vertical_pos); background_shadow.setPosition(0.0f, std::floor(shade.getSize().y + vertical_pos)); - sf::Vector2f font_position(std::floor(offset_x + background_margin_horizontal), std::floor(padding_vertical + background_margin_vertical + vertical_pos)); + sf::Vector2f font_position(std::floor(offset_x + background_margin_horizontal), std::floor(padding_top + background_margin_vertical + vertical_pos)); autocomplete_text.setPosition(font_position); text.setPosition(font_position); } @@ -302,7 +305,7 @@ namespace QuickMedia { float SearchBar::getBottomWithoutShadow() const { float font_height = text.getCharacterSize() + 7.0f; - return std::floor(font_height + background_margin_vertical * 2.0f) + padding_vertical + padding_vertical; + return std::floor(font_height + background_margin_vertical * 2.0f) + padding_top + padding_bottom; } std::string SearchBar::get_text() const { |