ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

finalized TimeLineWidget for new UI look

This commit is contained in:
thrust26 2018-02-07 14:55:43 +01:00
parent e01321fbea
commit 5764a73d89
2 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/gui/TimeLineWidget.cxx
View File

@ -25,6 +25,9 @@
#include "TimeLineWidget.hxx" #include "TimeLineWidget.hxx"
const int HANDLE_W = 3;
const int HANDLE_H = 3; // size above/below the slider
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
TimeLineWidget::TimeLineWidget(GuiObject* boss, const GUI::Font& font, TimeLineWidget::TimeLineWidget(GuiObject* boss, const GUI::Font& font,
int x, int y, int w, int h, int x, int y, int w, int h,
@ -85,7 +88,7 @@ void TimeLineWidget::setStepValues(const IntArray& steps)
if(steps.size() > _stepValue.capacity()) if(steps.size() > _stepValue.capacity())
_stepValue.reserve(2 * steps.size()); _stepValue.reserve(2 * steps.size());
double scale = (_w - _labelWidth - 2) / double(steps.back()); double scale = (_w - _labelWidth - 2 - HANDLE_W*0) / double(steps.back());
// Skip the very last value; we take care of it outside the end of the loop // Skip the very last value; we take care of it outside the end of the loop
for(uInt32 i = 0; i < steps.size() - 1; ++i) for(uInt32 i = 0; i < steps.size() - 1; ++i)
@ -93,7 +96,7 @@ void TimeLineWidget::setStepValues(const IntArray& steps)
// Due to integer <-> double conversion, the last value is sometimes // Due to integer <-> double conversion, the last value is sometimes
// slightly less than the maximum value; we assign it manually to fix this // slightly less than the maximum value; we assign it manually to fix this
_stepValue.push_back(_w - _labelWidth - 2); _stepValue.push_back(_w - _labelWidth - 2 - HANDLE_W*0);
} }
else else
_stepValue.push_back(0); _stepValue.push_back(0);
@ -148,18 +151,29 @@ void TimeLineWidget::drawWidget(bool hilite)
isEnabled() ? kTextColor : kColor, TextAlign::Left); isEnabled() ? kTextColor : kColor, TextAlign::Left);
int p = valueToPos(_value), int p = valueToPos(_value),
x = _x + _labelWidth; x = _x + _labelWidth,
w = _w - _labelWidth;
// Frame the handle
const int HANDLE_W2 = (HANDLE_W + 1) / 2;
s.hLine(x + p - HANDLE_W2, _y + 0, x + p - HANDLE_W2 + HANDLE_W, kColorInfo);
s.vLine(x + p - HANDLE_W2, _y + 1, _y + _h - 2, kColorInfo);
s.hLine(x + p - HANDLE_W2 + 1, _y + _h - 1, x + p - HANDLE_W2 + 1 + HANDLE_W, kBGColor);
s.vLine(x + p - HANDLE_W2 + 1 + HANDLE_W, _y + 1, _y + _h - 2, kBGColor);
// Frame the box
s.hLine(x, _y + HANDLE_H, x + w - 2, kColorInfo);
s.vLine(x, _y + HANDLE_H, _y + _h - 2 - HANDLE_H, kColorInfo);
s.hLine(x + 1, _y + _h - 1 - HANDLE_H, x + w - 1, kBGColor);
s.vLine(x + w - 1, _y + 1 + HANDLE_H, _y + _h - 2 - HANDLE_H, kBGColor);
// Draw the box
s.frameRect(x, _y, _w - _labelWidth, _h, isEnabled() && hilite ? kScrollColor : kColor);
// Fill the box // Fill the box
s.fillRect(x + 1, _y + 1, _w - _labelWidth - 2, _h - 2, s.fillRect(x + 1, _y + 1 + HANDLE_H, w - 2, _h - 2 - HANDLE_H * 2,
!isEnabled() ? kSliderBGColorLo : hilite ? kSliderBGColorHi : kSliderBGColor); !isEnabled() ? kSliderBGColorLo : hilite ? kSliderBGColorHi : kSliderBGColor);
// Draw the 'bar' // Draw the 'bar'
s.fillRect(x + 1, _y + 1, p, _h - 2, s.fillRect(x + 1, _y + 1 + HANDLE_H, p, _h - 2 - HANDLE_H * 2,
!isEnabled() ? kColor : hilite ? kSliderColorHi : kSliderColor); !isEnabled() ? kColor : hilite ? kSliderColorHi : kSliderColor);
// add 4 tickmarks for 5 intervals // Add 4 tickmarks for 5 intervals
int numTicks = std::min(5, int(_stepValue.size())); int numTicks = std::min(5, int(_stepValue.size()));
for(int i = 1; i < numTicks; ++i) for(int i = 1; i < numTicks; ++i)
{ {
@ -183,9 +197,12 @@ void TimeLineWidget::drawWidget(bool hilite)
else else
color = kSliderBGColorLo; color = kSliderBGColorLo;
} }
s.vLine(xt, _y + _h / 2, _y + _h - 2, color); s.vLine(xt, _y + _h / 2, _y + _h - 2 - HANDLE_H, color);
} }
} }
// Draw the handle
s.fillRect(x + p + 1 - HANDLE_W2, _y + 1, HANDLE_W, _h - 2,
!isEnabled() ? kColor : hilite ? kSliderColorHi : kSliderColor);
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

14
src/gui/TimeMachineDialog.cxx
View File

@ -184,17 +184,17 @@ TimeMachineDialog::TimeMachineDialog(OSystem& osystem, DialogContainer& parent,
ypos = V_BORDER; ypos = V_BORDER;
// Add index info // Add index info
myCurrentIdxWidget = new StaticTextWidget(this, font, xpos, ypos, " ", TextAlign::Left, kBGColor); myCurrentIdxWidget = new StaticTextWidget(this, font, xpos, ypos, "1000", TextAlign::Left, kBGColor);
myCurrentIdxWidget->setTextColor(kColorInfo); myCurrentIdxWidget->setTextColor(kColorInfo);
myLastIdxWidget = new StaticTextWidget(this, font, _w - H_BORDER - font.getStringWidth("8888"), ypos, myLastIdxWidget = new StaticTextWidget(this, font, _w - H_BORDER - font.getStringWidth("1000"), ypos,
" ", TextAlign::Right, kBGColor); "1000", TextAlign::Right, kBGColor);
myLastIdxWidget->setTextColor(kColorInfo); myLastIdxWidget->setTextColor(kColorInfo);
// Add timeline // Add timeline
const uInt32 tl_h = myCurrentIdxWidget->getHeight() / 2, const uInt32 tl_h = myCurrentIdxWidget->getHeight() / 2 + 6,
tl_x = xpos + myCurrentIdxWidget->getWidth() + 8, tl_x = xpos + myCurrentIdxWidget->getWidth() + 8,
tl_y = ypos + (myCurrentIdxWidget->getHeight() - tl_h) / 2 - 1, tl_y = ypos + (myCurrentIdxWidget->getHeight() - tl_h) / 2 - 1,
tl_w = myLastIdxWidget->getAbsX() - tl_x - 8; tl_w = myLastIdxWidget->getAbsX() - tl_x - 8;
myTimeline = new TimeLineWidget(this, font, tl_x, tl_y, tl_w, tl_h, "", 0, kTimeline); myTimeline = new TimeLineWidget(this, font, tl_x, tl_y, tl_w, tl_h, "", 0, kTimeline);
myTimeline->setMinValue(0); myTimeline->setMinValue(0);
ypos += rowHeight; ypos += rowHeight;