Skip to content

[BACKPORT #456] arch/sim: Fix NXWM test failure #458

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xiaoxiang781216 merged 1 commit into from
Nov 2, 2020
Merged

[BACKPORT #456] arch/sim: Fix NXWM test failure #458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 21 additions & 3 deletions graphics/nxwm/src/ctaskbar.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ using namespace NxWM;
CTaskbar::CTaskbar(void)
{
m_taskbar = (NXWidgets::CNxWindow *)0;
m_background = (NXWidgets::CNxWindow *)0;
m_background = (NXWidgets::CBgWindow *)0;
m_backImage = (NXWidgets::CImage *)0;
m_topApp = (IApplication *)0;
m_started = false;
Expand Down Expand Up @@ -163,7 +163,7 @@ void CTaskbar::disconnect(void)
// Then delete the background

delete m_background;
m_background = (NXWidgets::CNxWindow *)0;
m_background = (NXWidgets::CBgWindow *)0;
}

// Delete the background image
Expand Down Expand Up @@ -972,9 +972,27 @@ bool CTaskbar::createTaskbarWindow(void)

bool CTaskbar::createBackgroundWindow(void)
{
CWindowMessenger *control = new CWindowMessenger((NXWidgets::CWidgetStyle *)NULL);

// Create a raw window to present the background image

m_background = openRawWindow();
NXWidgets::CBgWindow *background = getBgWindow(control);
if (!background)
{
delete control;
return false;
}

// Open (and initialize) the BG window

bool success = background->open();
if (!success)
{
delete background;
return false;
}

m_background = background;
if (!m_background)
{
return false;
Expand Down
2 changes: 1 addition & 1 deletion include/graphics/nxwm/ctaskbar.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ namespace NxWM
*/

NXWidgets::CNxWindow *m_taskbar; /**< The task bar window */
NXWidgets::CNxWindow *m_background; /**< The background window */
NXWidgets::CBgWindow *m_background; /**< The background window */
NXWidgets::CImage *m_backImage; /**< The background image */
IApplication *m_topApp; /**< The top application in the hierarchy */
TNxArray<struct STaskbarSlot> m_slots; /**< List of application slots in the task bar */
Expand Down