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

fixed toned down dialogs

This commit is contained in:
thrust26 2018-01-26 20:13:22 +01:00
parent 8c0b212207
commit a7308b4c0d
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/common/Stack.hxx
View File

@ -44,6 +44,7 @@ class FixedStack
bool full() const { return _size >= CAPACITY; } bool full() const { return _size >= CAPACITY; }
T top() const { return _stack[_size - 1]; } T top() const { return _stack[_size - 1]; }
T get(uInt32 pos) { return _stack[pos]; };
void push(const T& x) { _stack[_size++] = x; } void push(const T& x) { _stack[_size++] = x; }
T pop() { return std::move(_stack[--_size]); } T pop() { return std::move(_stack[--_size]); }
uInt32 size() const { return _size; } uInt32 size() const { return _size; }

9
src/gui/Dialog.cxx
View File

@ -27,6 +27,10 @@
#include "Dialog.hxx" #include "Dialog.hxx"
#include "Widget.hxx" #include "Widget.hxx"
#include "TabWidget.hxx" #include "TabWidget.hxx"
#include "ContextMenu.hxx"
#include "PopUpWidget.hxx"
#include "Vec.hxx" #include "Vec.hxx"
/* /*
@ -318,7 +322,10 @@ void Dialog::drawDialog()
if(_dirty) if(_dirty)
{ {
bool onTop = parent().myDialogStack.top() == this; // dialog is still on top if e.g a ContextMenu is opened
bool onTop = parent().myDialogStack.top() == this
|| parent().myDialogStack.get(parent().myDialogStack.size() - 2) == this
&& !parent().myDialogStack.top()->hasTitle();
if(_flags & WIDGET_CLEARBG) if(_flags & WIDGET_CLEARBG)
{ {

1
src/gui/Dialog.hxx
View File

@ -87,6 +87,7 @@ class Dialog : public GuiObject
int getFlags() const { return _flags; } int getFlags() const { return _flags; }
void setTitle(const string& title); void setTitle(const string& title);
bool hasTitle() { return !_title.empty(); }
protected: protected:
virtual void draw() override { } virtual void draw() override { }