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

The TIA info area of the debugger is now font-sensitive. 

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2804 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2013-08-20 15:23:07 +00:00
parent 4ef0416e26
commit 28b80d93cf
3 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/debugger/gui/DebuggerDialog.cxx
View File

@ -290,7 +290,7 @@ void DebuggerDialog::addStatusArea()
int xpos, ypos; int xpos, ypos;
xpos = r.left; ypos = r.top; xpos = r.left; ypos = r.top;
myTiaInfo = new TiaInfoWidget(this, *myFont, xpos, ypos); myTiaInfo = new TiaInfoWidget(this, *myFont, xpos, ypos, r.width());
ypos += myTiaInfo->getHeight() + 10; ypos += myTiaInfo->getHeight() + 10;
myTiaZoom = new TiaZoomWidget(this, *myFont, xpos+10, ypos, myTiaZoom = new TiaZoomWidget(this, *myFont, xpos+10, ypos,

41
src/debugger/gui/TiaInfoWidget.cxx
View File

@ -30,51 +30,58 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
TiaInfoWidget::TiaInfoWidget(GuiObject* boss, const GUI::Font& font, TiaInfoWidget::TiaInfoWidget(GuiObject* boss, const GUI::Font& font,
int x, int y) int x, int y, int max_w)
: Widget(boss, font, x, y, 16, 16), : Widget(boss, font, x, y, 16, 16),
CommandSender(boss) CommandSender(boss)
{ {
bool longstr = 34 * font.getMaxCharWidth() <= max_w;
x += 5; x += 5;
const int lineHeight = font.getLineHeight(); const int lineHeight = font.getLineHeight();
int xpos = x, ypos = y, lwidth = font.getStringWidth("F. Cyc:"); int xpos = x, ypos = y;
int lwidth = font.getStringWidth(longstr ? "Frame Cycle:" : "F. Cycle:");
int fwidth = 5 * font.getMaxCharWidth() + 4;
// Add frame info // Add frame info
xpos = x; ypos = y + 10; xpos = x; ypos = y + 10;
new StaticTextWidget(boss, font, xpos, ypos, lwidth, lineHeight, new StaticTextWidget(boss, font, xpos, ypos, lwidth, lineHeight,
"Frame:", kTextAlignLeft); longstr ? "Frame Count:" : "Frame:",
kTextAlignLeft);
xpos += lwidth; xpos += lwidth;
myFrameCount = new EditTextWidget(boss, font, xpos, ypos-1, 45, lineHeight, ""); myFrameCount = new EditTextWidget(boss, font, xpos, ypos-1, fwidth, lineHeight, "");
myFrameCount->setEditable(false); myFrameCount->setEditable(false);
xpos = x; ypos += lineHeight + 5; xpos = x; ypos += lineHeight + 5;
new StaticTextWidget(boss, font, xpos, ypos, lwidth, lineHeight, new StaticTextWidget(boss, font, xpos, ypos, lwidth, lineHeight,
"F. Cyc:", kTextAlignLeft); longstr ? "Frame Cycle:" : "F. Cycle:",
kTextAlignLeft);
xpos += lwidth; xpos += lwidth;
myFrameCycles = new EditTextWidget(boss, font, xpos, ypos-1, 45, lineHeight, ""); myFrameCycles = new EditTextWidget(boss, font, xpos, ypos-1, fwidth, lineHeight, "");
myFrameCycles->setEditable(false); myFrameCycles->setEditable(false);
xpos = x + 10; ypos += lineHeight + 8; xpos = x + 20; ypos += lineHeight + 8;
myVSync = new CheckboxWidget(boss, font, xpos, ypos-3, "VSync", 0); myVSync = new CheckboxWidget(boss, font, xpos, ypos-3, "VSync", 0);
myVSync->setEditable(false); myVSync->setEditable(false);
xpos = x + 10; ypos += lineHeight + 5; xpos = x + 20; ypos += lineHeight + 5;
myVBlank = new CheckboxWidget(boss, font, xpos, ypos-3, "VBlank", 0); myVBlank = new CheckboxWidget(boss, font, xpos, ypos-3, "VBlank", 0);
myVBlank->setEditable(false); myVBlank->setEditable(false);
xpos = x + lwidth + myFrameCycles->getWidth() + 5; ypos = y + 10; xpos = x + lwidth + myFrameCycles->getWidth() + 8; ypos = y + 10;
lwidth = font.getStringWidth("Pixel Pos:"); lwidth = font.getStringWidth(longstr ? "Color Clock:" : "Pixel Pos:");
fwidth = 3 * font.getMaxCharWidth() + 4;
new StaticTextWidget(boss, font, xpos, ypos, lwidth, lineHeight, new StaticTextWidget(boss, font, xpos, ypos, lwidth, lineHeight,
"Scanline:", kTextAlignLeft); "Scanline:", kTextAlignLeft);
myScanlineCount = new EditTextWidget(boss, font, xpos+lwidth, ypos-1, 30, myScanlineCount = new EditTextWidget(boss, font, xpos+lwidth, ypos-1, fwidth,
lineHeight, ""); lineHeight, "");
myScanlineCount->setEditable(false); myScanlineCount->setEditable(false);
ypos += lineHeight + 5; ypos += lineHeight + 5;
new StaticTextWidget(boss, font, xpos, ypos, lwidth, lineHeight, new StaticTextWidget(boss, font, xpos, ypos, lwidth, lineHeight,
"S. Cyc:", kTextAlignLeft); longstr ? "Scan Cycle:" : "S. Cycle:", kTextAlignLeft);
myScanlineCycles = new EditTextWidget(boss, font, xpos+lwidth, ypos-1, 30, myScanlineCycles = new EditTextWidget(boss, font, xpos+lwidth, ypos-1, fwidth,
lineHeight, ""); lineHeight, "");
myScanlineCycles->setEditable(false); myScanlineCycles->setEditable(false);
@ -82,20 +89,20 @@ TiaInfoWidget::TiaInfoWidget(GuiObject* boss, const GUI::Font& font,
new StaticTextWidget(boss, font, xpos, ypos, lwidth, lineHeight, new StaticTextWidget(boss, font, xpos, ypos, lwidth, lineHeight,
"Pixel Pos:", kTextAlignLeft); "Pixel Pos:", kTextAlignLeft);
myPixelPosition = new EditTextWidget(boss, font, xpos+lwidth, ypos-1, 30, myPixelPosition = new EditTextWidget(boss, font, xpos+lwidth, ypos-1, fwidth,
lineHeight, ""); lineHeight, "");
myPixelPosition->setEditable(false); myPixelPosition->setEditable(false);
ypos += lineHeight + 5; ypos += lineHeight + 5;
new StaticTextWidget(boss, font, xpos, ypos, lwidth, lineHeight, new StaticTextWidget(boss, font, xpos, ypos, lwidth, lineHeight,
"Color Clk:", kTextAlignLeft); longstr ? "Color Clock:" : "Color Clk:", kTextAlignLeft);
myColorClocks = new EditTextWidget(boss, font, xpos+lwidth, ypos-1, 30, myColorClocks = new EditTextWidget(boss, font, xpos+lwidth, ypos-1, fwidth,
lineHeight, ""); lineHeight, "");
myColorClocks->setEditable(false); myColorClocks->setEditable(false);
// Calculate actual dimensions // Calculate actual dimensions
_w = 100 + 30 + lwidth; _w = myColorClocks->getAbsX() + myColorClocks->getWidth() - x;
_h = ypos + lineHeight; _h = ypos + lineHeight;
} }

2
src/debugger/gui/TiaInfoWidget.hxx
View File

@ -30,7 +30,7 @@ class EditTextWidget;
class TiaInfoWidget : public Widget, public CommandSender class TiaInfoWidget : public Widget, public CommandSender
{ {
public: public:
TiaInfoWidget(GuiObject *boss, const GUI::Font& font, int x, int y); TiaInfoWidget(GuiObject *boss, const GUI::Font& font, int x, int y, int max_w);
virtual ~TiaInfoWidget(); virtual ~TiaInfoWidget();
void loadConfig(); void loadConfig();