summaryrefslogtreecommitdiff
path: root/unity-shared
diff options
authorMarco Trevisan (Treviño) <mail@3v1n0.net>2014-07-07 23:57:12 +0200
committerMarco Trevisan (Treviño) <mail@3v1n0.net>2014-07-07 23:57:12 +0200
commit35e971e926ca2382d4d3f4175a6ffed2e6f8da0c (patch)
tree6b988441ede8903d02a08cc7832cdd77b1437169 /unity-shared
parent90b26d16cde10694648b1e0a8dc674e942bc80ba (diff)
PlacesGroup, SearchBar: reset min/max sizes when updating the scale
(bzr r3830.3.27)
Diffstat (limited to 'unity-shared')
-rw-r--r--unity-shared/SearchBar.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/unity-shared/SearchBar.cpp b/unity-shared/SearchBar.cpp
index 2bc4c3aa2..f23b18896 100644
--- a/unity-shared/SearchBar.cpp
+++ b/unity-shared/SearchBar.cpp
@@ -156,7 +156,7 @@ SearchBar::SearchBar(bool show_filter_hint, NUX_FILE_LINE_DECL)
nux::HLayout* hint_layout = new nux::HLayout(NUX_TRACKER_LOCATION);
- hint_ = new StaticCairoText(" ");
+ hint_ = new StaticCairoText("");
hint_->SetTextColor(nux::Color(1.0f, 1.0f, 1.0f, 0.5f));
hint_->SetFont(HINT_LABEL_DEFAULT_FONT.c_str());
hint_layout->AddView(hint_, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
@@ -326,6 +326,8 @@ void SearchBar::UpdateSearchBarSize()
void SearchBar::UpdateScale(double scale)
{
+ hint_->SetMinimumSize(nux::AREA_MIN_WIDTH, nux::AREA_MIN_HEIGHT);
+ hint_->SetMaximumSize(nux::AREA_MAX_WIDTH, nux::AREA_MAX_HEIGHT);
hint_->SetScale(scale);
spinner_->scale = scale;