Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

UI: Remove padding hack for setting info message.

Browse source
This commit is contained in:
Unknown W. Brackets 2017-06-03 09:38:37 -07:00
parent 64c2194989
commit 4e49992e5c
2 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
UI/GameSettingsScreen.cpp
View file

@ -1511,6 +1511,16 @@ UI::EventReturn ProAdhocServerScreen::OnCancelClick(UI::EventParams &e) {
return UI::EVENT_DONE;
}
SettingInfoMessage::SettingInfoMessage(int align, UI::AnchorLayoutParams *lp)
: UI::LinearLayout(UI::ORIENT_HORIZONTAL, lp) {
using namespace UI;
SetSpacing(0.0f);
Add(new UI::Spacer(10.0f));
text_ = Add(new UI::TextView("", align, false, new LinearLayoutParams(1.0, Margins(0, 10))));
text_->SetTag("TEST?");
Add(new UI::Spacer(10.0f));
}
void SettingInfoMessage::Show(const std::string &text, UI::View *refView) {
if (refView) {
Bounds b = refView->GetBounds();
@ -1521,23 +1531,17 @@ void SettingInfoMessage::Show(const std::string &text, UI::View *refView) {
ReplaceLayoutParams(new UI::AnchorLayoutParams(lp->width, lp->height, lp->left, dp_yres - 80.0f - 40.0f, lp->right, lp->bottom, lp->center));
}
}
SetText(text);
text_->SetText(text);
timeShown_ = time_now_d();
}
void SettingInfoMessage::GetContentDimensionsBySpec(const UIContext &dc, UI::MeasureSpec horiz, UI::MeasureSpec vert, float &w, float &h) const {
TextView::GetContentDimensionsBySpec(dc, horiz, vert, w, h);
w += 20.0f;
h += 20.0f;
}
void SettingInfoMessage::Draw(UIContext &dc) {
static const double FADE_TIME = 1.0;
static const float MAX_ALPHA = 0.9f;
// Let's show longer messages for more time (guesstimate at reading speed.)
// Note: this will give multibyte characters more time, but they often have shorter words anyway.
double timeToShow = std::max(1.5, GetText().size() * 0.05);
double timeToShow = std::max(1.5, text_->GetText().size() * 0.05);
double sinceShow = time_now_d() - timeShown_;
float alpha = MAX_ALPHA;
@ -1553,9 +1557,6 @@ void SettingInfoMessage::Draw(UIContext &dc) {
dc.FillRect(style.background, bounds_);
}
SetTextColor(whiteAlpha(alpha));
// Fake padding by adjusting bounds.
SetBounds(bounds_.Expand(-10.0f));
TextView::Draw(dc);
SetBounds(bounds_.Expand(10.0f));
text_->SetTextColor(whiteAlpha(alpha));
ViewGroup::Draw(dc);
}

10
UI/GameSettingsScreen.h
View file

@ -122,22 +122,20 @@ private:
bool tessHWEnable_;
};
class SettingInfoMessage : public UI::TextView {
class SettingInfoMessage : public UI::LinearLayout {
public:
SettingInfoMessage(int align, UI::AnchorLayoutParams *lp)
: UI::TextView("", align, false, lp), timeShown_(0.0) {
}
SettingInfoMessage(int align, UI::AnchorLayoutParams *lp);
void SetBottomCutoff(float y) {
cutOffY_ = y;
}
void Show(const std::string &text, UI::View *refView = nullptr);
void GetContentDimensionsBySpec(const UIContext &dc, UI::MeasureSpec horiz, UI::MeasureSpec vert, float &w, float &h) const;
void Draw(UIContext &dc);
private:
double timeShown_;
UI::TextView *text_ = nullptr;
double timeShown_ = 0.0;
float cutOffY_;
};