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

Fixed several (invisible) widget transparency issues (WIDGET_CLEARBG)

This commit is contained in:
thrust26 2017-12-17 21:19:32 +01:00
parent 3943076455
commit c9eaf31181
9 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui/DeveloperDialog.cxx
View File

@ -202,7 +202,6 @@ void DeveloperDialog::addVideoTab(const GUI::Font& font)
myTVJitterRecWidget->getRight() + 4, myTVJitterRecWidget->getRight() + 4,
myTVJitterRecWidget->getTop() + 2, myTVJitterRecWidget->getTop() + 2,
5 * fontWidth, fontHeight, "", TextAlign::Left); 5 * fontWidth, fontHeight, "", TextAlign::Left);
myTVJitterRecLabelWidget->setFlags(WIDGET_CLEARBG);
wid.push_back(myTVJitterRecLabelWidget); wid.push_back(myTVJitterRecLabelWidget);
ypos += lineHeight + VGAP; ypos += lineHeight + VGAP;
@ -431,7 +430,6 @@ void DeveloperDialog::addDebuggerTab(const GUI::Font& font)
new StaticTextWidget(myTab, font, new StaticTextWidget(myTab, font,
xpos + myDebuggerWidthSlider->getWidth() + 4, xpos + myDebuggerWidthSlider->getWidth() + 4,
ypos + 1, 4 * fontWidth, fontHeight, "", TextAlign::Left); ypos + 1, 4 * fontWidth, fontHeight, "", TextAlign::Left);
myDebuggerWidthLabel->setFlags(WIDGET_CLEARBG);
ypos += lineHeight + VGAP; ypos += lineHeight + VGAP;
myDebuggerHeightSlider = new SliderWidget(myTab, font, xpos, ypos-1, pwidth, myDebuggerHeightSlider = new SliderWidget(myTab, font, xpos, ypos-1, pwidth,
@ -445,7 +443,6 @@ void DeveloperDialog::addDebuggerTab(const GUI::Font& font)
new StaticTextWidget(myTab, font, new StaticTextWidget(myTab, font,
xpos + myDebuggerHeightSlider->getWidth() + 4, xpos + myDebuggerHeightSlider->getWidth() + 4,
ypos + 1, 4 * fontWidth, fontHeight, "", TextAlign::Left); ypos + 1, 4 * fontWidth, fontHeight, "", TextAlign::Left);
myDebuggerHeightLabel->setFlags(WIDGET_CLEARBG);
// Add message concerning usage // Add message concerning usage
const GUI::Font& infofont = instance().frameBuffer().infoFont(); const GUI::Font& infofont = instance().frameBuffer().infoFont();

1
src/gui/EventMappingWidget.cxx
View File

@ -109,7 +109,6 @@ EventMappingWidget::EventMappingWidget(GuiObject* boss, const GUI::Font& font,
StaticTextWidget* t; StaticTextWidget* t;
t = new StaticTextWidget(boss, font, xpos, ypos+2, font.getStringWidth("Action"), t = new StaticTextWidget(boss, font, xpos, ypos+2, font.getStringWidth("Action"),
fontHeight, "Action", TextAlign::Left); fontHeight, "Action", TextAlign::Left);
t->setFlags(WIDGET_CLEARBG);
myKeyMapping = new EditTextWidget(boss, font, xpos + t->getWidth() + 8, ypos, myKeyMapping = new EditTextWidget(boss, font, xpos + t->getWidth() + 8, ypos,
_w - xpos - t->getWidth() - 15, lineHeight, ""); _w - xpos - t->getWidth() - 15, lineHeight, "");

4
src/gui/GameInfoDialog.cxx
View File

@ -282,7 +282,6 @@ GameInfoDialog::GameInfoDialog(
myMouseRangeLabel = new StaticTextWidget(myTab, font, myMouseRangeLabel = new StaticTextWidget(myTab, font,
myMouseRange->getRight() + 4, myMouseRange->getTop()+1, myMouseRange->getRight() + 4, myMouseRange->getTop()+1,
" ", TextAlign::Left); " ", TextAlign::Left);
myMouseRangeLabel->setFlags(WIDGET_CLEARBG);
// Add items for tab 2 // Add items for tab 2
addToFocusList(wid, myTab, tabID); addToFocusList(wid, myTab, tabID);
@ -316,7 +315,6 @@ GameInfoDialog::GameInfoDialog(
wid.push_back(myYStart); wid.push_back(myYStart);
myYStartLabel = new StaticTextWidget(myTab, font, myYStart->getRight() + 4, myYStartLabel = new StaticTextWidget(myTab, font, myYStart->getRight() + 4,
ypos+1, 5*fontWidth, fontHeight, "", TextAlign::Left); ypos+1, 5*fontWidth, fontHeight, "", TextAlign::Left);
myYStartLabel->setFlags(WIDGET_CLEARBG);
ypos += lineHeight + vGap; ypos += lineHeight + vGap;
t = new StaticTextWidget(myTab, font, hSpace, ypos+1, "Height ", TextAlign::Left); t = new StaticTextWidget(myTab, font, hSpace, ypos+1, "Height ", TextAlign::Left);
@ -327,7 +325,6 @@ GameInfoDialog::GameInfoDialog(
wid.push_back(myHeight); wid.push_back(myHeight);
myHeightLabel = new StaticTextWidget(myTab, font, myHeight->getRight() + 4, myHeightLabel = new StaticTextWidget(myTab, font, myHeight->getRight() + 4,
ypos+1, 5*fontWidth, fontHeight, "", TextAlign::Left); ypos+1, 5*fontWidth, fontHeight, "", TextAlign::Left);
myHeightLabel->setFlags(WIDGET_CLEARBG);
// Phosphor // Phosphor
ypos += lineHeight + vGap*4; ypos += lineHeight + vGap*4;
@ -345,7 +342,6 @@ GameInfoDialog::GameInfoDialog(
myPPBlendLabel = new StaticTextWidget(myTab, font, myPPBlendLabel = new StaticTextWidget(myTab, font,
myPPBlend->getRight() + 4, myPhosphor->getTop(), myPPBlend->getRight() + 4, myPhosphor->getTop(),
5*fontWidth, fontHeight, "", TextAlign::Left); 5*fontWidth, fontHeight, "", TextAlign::Left);
myPPBlendLabel->setFlags(WIDGET_CLEARBG);
// Add items for tab 3 // Add items for tab 3
addToFocusList(wid, myTab, tabID); addToFocusList(wid, myTab, tabID);

4
src/gui/InputDialog.cxx
View File

@ -163,7 +163,6 @@ void InputDialog::addDevicePortTab(const GUI::Font& font)
xpos = hSpace + myDeadzone->getWidth() + 5; xpos = hSpace + myDeadzone->getWidth() + 5;
myDeadzoneLabel = new StaticTextWidget(myTab, font, xpos, ypos+1, 5*fontWidth, myDeadzoneLabel = new StaticTextWidget(myTab, font, xpos, ypos+1, 5*fontWidth,
lineHeight, "", TextAlign::Left); lineHeight, "", TextAlign::Left);
myDeadzoneLabel->setFlags(WIDGET_CLEARBG);
wid.push_back(myDeadzone); wid.push_back(myDeadzone);
// Add paddle speed (digital emulation) // Add paddle speed (digital emulation)
@ -175,7 +174,6 @@ void InputDialog::addDevicePortTab(const GUI::Font& font)
xpos = hSpace + myDPaddleSpeed->getWidth() + 5; xpos = hSpace + myDPaddleSpeed->getWidth() + 5;
myDPaddleLabel = new StaticTextWidget(myTab, font, xpos, ypos+1, 24, lineHeight, myDPaddleLabel = new StaticTextWidget(myTab, font, xpos, ypos+1, 24, lineHeight,
"", TextAlign::Left); "", TextAlign::Left);
myDPaddleLabel->setFlags(WIDGET_CLEARBG);
wid.push_back(myDPaddleSpeed); wid.push_back(myDPaddleSpeed);
// Add paddle speed (mouse emulation) // Add paddle speed (mouse emulation)
@ -187,7 +185,6 @@ void InputDialog::addDevicePortTab(const GUI::Font& font)
xpos = hSpace + myMPaddleSpeed->getWidth() + 5; xpos = hSpace + myMPaddleSpeed->getWidth() + 5;
myMPaddleLabel = new StaticTextWidget(myTab, font, xpos, ypos+1, 24, lineHeight, myMPaddleLabel = new StaticTextWidget(myTab, font, xpos, ypos+1, 24, lineHeight,
"", TextAlign::Left); "", TextAlign::Left);
myMPaddleSpeed->setFlags(WIDGET_CLEARBG);
wid.push_back(myMPaddleSpeed); wid.push_back(myMPaddleSpeed);
// Add trackball speed // Add trackball speed
@ -199,7 +196,6 @@ void InputDialog::addDevicePortTab(const GUI::Font& font)
xpos = hSpace + myTrackBallSpeed->getWidth() + 5; xpos = hSpace + myTrackBallSpeed->getWidth() + 5;
myTrackBallLabel = new StaticTextWidget(myTab, font, xpos, ypos+1, 24, lineHeight, myTrackBallLabel = new StaticTextWidget(myTab, font, xpos, ypos+1, 24, lineHeight,
"", TextAlign::Left); "", TextAlign::Left);
myTrackBallSpeed->setFlags(WIDGET_CLEARBG);
wid.push_back(myTrackBallSpeed); wid.push_back(myTrackBallSpeed);
// Add 'allow all 4 directions' for joystick // Add 'allow all 4 directions' for joystick

2
src/gui/PopUpWidget.cxx
View File

@ -57,7 +57,7 @@ PopUpWidget::PopUpWidget(GuiObject* boss, const GUI::Font& font,
_label(label), _label(label),
_labelWidth(labelWidth) _labelWidth(labelWidth)
{ {
_flags = WIDGET_ENABLED | WIDGET_CLEARBG | WIDGET_RETAIN_FOCUS; _flags = WIDGET_ENABLED | WIDGET_RETAIN_FOCUS;
_bgcolor = kDlgColor; _bgcolor = kDlgColor;
_bgcolorhi = kDlgColor; // do not highlight the label _bgcolorhi = kDlgColor; // do not highlight the label
_textcolor = kTextColor; _textcolor = kTextColor;

2
src/gui/TabWidget.cxx
View File

@ -312,7 +312,7 @@ void TabWidget::drawWidget(bool hilite)
#else #else
int yOffset = (i == _activeTab) ? 0 : 1; int yOffset = (i == _activeTab) ? 0 : 1;
s.fillRect(x, _y, _tabWidth, _tabHeight, (i == _activeTab) s.fillRect(x, _y, _tabWidth, _tabHeight, (i == _activeTab)
? kDlgColor : kBGColorHi); ? kDlgColor : kBGColorHi); // ? kWidColor : kDlgColor
s.drawString(_font, _tabs[i].title, x + kTabPadding + yOffset, s.drawString(_font, _tabs[i].title, x + kTabPadding + yOffset,
_y + yOffset + (_tabHeight - _fontHeight - 1), _y + yOffset + (_tabHeight - _fontHeight - 1),
_tabWidth - 2 * kTabPadding, (i == _activeTab |true) ? fontcolor : kColor, TextAlign::Center); _tabWidth - 2 * kTabPadding, (i == _activeTab |true) ? fontcolor : kColor, TextAlign::Center);

2
src/gui/UIDialog.cxx
View File

@ -77,7 +77,6 @@ UIDialog::UIDialog(OSystem& osystem, DialogContainer& parent,
new StaticTextWidget(myTab, font, new StaticTextWidget(myTab, font,
xpos + myLauncherWidthSlider->getWidth() + 4, xpos + myLauncherWidthSlider->getWidth() + 4,
ypos + 1, 4*fontWidth, fontHeight, "", TextAlign::Left); ypos + 1, 4*fontWidth, fontHeight, "", TextAlign::Left);
myLauncherWidthLabel->setFlags(WIDGET_CLEARBG);
ypos += lineHeight + 4; ypos += lineHeight + 4;
myLauncherHeightSlider = new SliderWidget(myTab, font, xpos, ypos, pwidth, myLauncherHeightSlider = new SliderWidget(myTab, font, xpos, ypos, pwidth,
@ -91,7 +90,6 @@ UIDialog::UIDialog(OSystem& osystem, DialogContainer& parent,
new StaticTextWidget(myTab, font, new StaticTextWidget(myTab, font,
xpos + myLauncherHeightSlider->getWidth() + 4, xpos + myLauncherHeightSlider->getWidth() + 4,
ypos + 1, 4*fontWidth, fontHeight, "", TextAlign::Left); ypos + 1, 4*fontWidth, fontHeight, "", TextAlign::Left);
myLauncherHeightLabel->setFlags(WIDGET_CLEARBG);
ypos += lineHeight + 4; ypos += lineHeight + 4;
// Launcher font // Launcher font

4
src/gui/VideoDialog.cxx
View File

@ -116,7 +116,6 @@ VideoDialog::VideoDialog(OSystem& osystem, DialogContainer& parent,
myNAspectRatioLabel = myNAspectRatioLabel =
new StaticTextWidget(myTab, font, xpos + myNAspectRatio->getWidth() + 4, new StaticTextWidget(myTab, font, xpos + myNAspectRatio->getWidth() + 4,
ypos + 1, fontWidth * 3, fontHeight, "", TextAlign::Left); ypos + 1, fontWidth * 3, fontHeight, "", TextAlign::Left);
myNAspectRatioLabel->setFlags(WIDGET_CLEARBG);
ypos += lineHeight + VGAP; ypos += lineHeight + VGAP;
// Aspect ratio (PAL mode) // Aspect ratio (PAL mode)
@ -128,7 +127,6 @@ VideoDialog::VideoDialog(OSystem& osystem, DialogContainer& parent,
myPAspectRatioLabel = myPAspectRatioLabel =
new StaticTextWidget(myTab, font, xpos + myPAspectRatio->getWidth() + 4, new StaticTextWidget(myTab, font, xpos + myPAspectRatio->getWidth() + 4,
ypos + 1, fontWidth * 3, fontHeight, "", TextAlign::Left); ypos + 1, fontWidth * 3, fontHeight, "", TextAlign::Left);
myPAspectRatioLabel->setFlags(WIDGET_CLEARBG);
ypos += lineHeight + VGAP; ypos += lineHeight + VGAP;
// Framerate // Framerate
@ -141,7 +139,6 @@ VideoDialog::VideoDialog(OSystem& osystem, DialogContainer& parent,
myFrameRateLabel = myFrameRateLabel =
new StaticTextWidget(myTab, font, xpos + myFrameRate->getWidth() + 4, new StaticTextWidget(myTab, font, xpos + myFrameRate->getWidth() + 4,
ypos + 1, fontWidth * 4, fontHeight, "", TextAlign::Left); ypos + 1, fontWidth * 4, fontHeight, "", TextAlign::Left);
myFrameRateLabel->setFlags(WIDGET_CLEARBG);
// Add message concerning usage // Add message concerning usage
const GUI::Font& infofont = instance().frameBuffer().infoFont(); const GUI::Font& infofont = instance().frameBuffer().infoFont();
@ -229,7 +226,6 @@ VideoDialog::VideoDialog(OSystem& osystem, DialogContainer& parent,
myTV ## obj ## Label = \ myTV ## obj ## Label = \
new StaticTextWidget(myTab, font, xpos+myTV ## obj->getWidth()+4, \ new StaticTextWidget(myTab, font, xpos+myTV ## obj->getWidth()+4, \
ypos+1, fontWidth*3, fontHeight, "", TextAlign::Left);\ ypos+1, fontWidth*3, fontHeight, "", TextAlign::Left);\
myTV ## obj->setFlags(WIDGET_CLEARBG); \
ypos += lineHeight + VGAP; ypos += lineHeight + VGAP;
pwidth = swidth; pwidth = swidth;

4
src/gui/Widget.cxx
View File

@ -297,7 +297,7 @@ StaticTextWidget::StaticTextWidget(GuiObject* boss, const GUI::Font& font,
: Widget(boss, font, x, y, w, h), : Widget(boss, font, x, y, w, h),
_align(align) _align(align)
{ {
_flags = WIDGET_ENABLED | WIDGET_CLEARBG; _flags = WIDGET_ENABLED;
_bgcolor = kDlgColor; _bgcolor = kDlgColor;
_bgcolorhi = kDlgColor; _bgcolorhi = kDlgColor;
_textcolor = kTextColor; _textcolor = kTextColor;
@ -671,7 +671,7 @@ SliderWidget::SliderWidget(GuiObject* boss, const GUI::Font& font,
_isDragging(false), _isDragging(false),
_labelWidth(labelWidth) _labelWidth(labelWidth)
{ {
_flags = WIDGET_ENABLED | WIDGET_TRACK_MOUSE | WIDGET_CLEARBG; _flags = WIDGET_ENABLED | WIDGET_TRACK_MOUSE;
_bgcolor = kDlgColor; _bgcolor = kDlgColor;
_bgcolorhi = kDlgColor; _bgcolorhi = kDlgColor;