Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 21:39:52 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix bug causing clickables not to highlight on mousedown in SDL builds

Browse Source
This commit is contained in:
Henrik Rydgård 2013-10-21 11:00:09 +02:00
parent e783dbd76b
commit fff83ed237
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ui/view.cpp
View File

@ -169,7 +169,6 @@ void Clickable::FocusChanged(int focusFlags) {
}
}
void Clickable::Touch(const TouchInput &input) {
if (!enabled_) {
dragging_ = false;
@ -190,12 +189,12 @@ void Clickable::Touch(const TouchInput &input) {
} else if (input.flags & TOUCH_MOVE) {
if (dragging_)
down_ = bounds_.Contains(input.x, input.y);
}
}
if (input.flags & TOUCH_UP) {
if ((input.flags & TOUCH_CANCEL) == 0 && dragging_ && bounds_.Contains(input.x, input.y)) {
Click();
}
down_ = false;
down_ = false;
downCountDown_ = 0;
dragging_ = false;
}
@ -212,7 +211,7 @@ bool IsEscapeKeyCode(int keyCode) {
}
void Clickable::Key(const KeyInput &key) {
if (!HasFocus()) {
if (!HasFocus() && key.deviceId != DEVICE_ID_MOUSE) {
down_ = false;
return;
}
@ -285,7 +284,7 @@ void ClickableItem::GetContentDimensions(const UIContext &dc, float &w, float &h
}
ClickableItem::ClickableItem(LayoutParams *layoutParams) : Clickable(layoutParams) {
if (layoutParams_->width == WRAP_CONTENT)
if (layoutParams_->width == WRAP_CONTENT)
layoutParams_->width = FILL_PARENT;
layoutParams_->height = ITEM_HEIGHT;
}
@ -299,7 +298,7 @@ void ClickableItem::Draw(UIContext &dc) {
if (down_) {
style = dc.theme->itemDownStyle;
}
dc.FillRect(style.background, bounds_);
}
@ -315,10 +314,9 @@ void Choice::GetContentDimensions(const UIContext &dc, float &w, float &h) const
h += 16;
}
void Choice::HighlightChanged(bool highlighted){
highlighted_ = highlighted;
};
void Choice::HighlightChanged(bool highlighted){
highlighted_ = highlighted;
}
void Choice::Draw(UIContext &dc) {
if (!IsSticky()) {
@ -401,7 +399,7 @@ void CheckBox::Draw(UIContext &dc) {
Style style = dc.theme->itemStyle;
if (!IsEnabled())
style = dc.theme->itemDisabledStyle;
dc.SetFontStyle(dc.theme->uiFont);
dc.DrawText(text_.c_str(), bounds_.x + paddingX, bounds_.centerY(), style.fgColor, ALIGN_VCENTER);
dc.Draw()->DrawImage(image, bounds_.x2() - paddingX, bounds_.centerY(), 1.0f, style.fgColor, ALIGN_RIGHT | ALIGN_VCENTER);

1
ui/view.h
View File

@ -513,7 +513,6 @@ public:
: ClickableItem(layoutParams), text_(text), smallText_(), atlasImage_(-1), centered_(false), highlighted_(false), selected_(false) {}
Choice(const std::string &text, const std::string &smallText, bool selected = false, LayoutParams *layoutParams = 0)
: ClickableItem(layoutParams), text_(text), smallText_(smallText), atlasImage_(-1), centered_(false), highlighted_(false), selected_(selected) {}
Choice(ImageID image, LayoutParams *layoutParams = 0)
: ClickableItem(layoutParams), atlasImage_(image), centered_(false), highlighted_(false), selected_(false) {}