5cf9c735cb
Fix bug with not being able to update wxTaskBarIcon under MSW after a DPI scale change or [dis]connection of another monitor using different DPI: this resulted in "TaskbarCreated" message being sent by the system, which we handled by trying to create the taskbar icon again. However in this case, recreating it failed, presumably because it still existed, as modifying the existing icon still worked. Change the handle of "TaskbarCreated" to try both adding and updating the icon, as it seems that we can't be sure whether we still have it or not when we get this message. Refactor the existing code to specify the operation to perform when calling the new DoSetIcon(). This actually makes things slightly simpler for it, as it doesn't need to update m_iconAdded inside it any more. Closes #18588.
86 lines
2.7 KiB
C++
86 lines
2.7 KiB
C++
/////////////////////////////////////////////////////////////////////////
|
|
// File: wx/msw/taskbar.h
|
|
// Purpose: Defines wxTaskBarIcon class for manipulating icons on the
|
|
// Windows task bar.
|
|
// Author: Julian Smart
|
|
// Modified by: Vaclav Slavik
|
|
// Created: 24/3/98
|
|
// Copyright: (c) Julian Smart
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_TASKBAR_H_
|
|
#define _WX_TASKBAR_H_
|
|
|
|
#include "wx/icon.h"
|
|
|
|
// private helper class:
|
|
class WXDLLIMPEXP_FWD_CORE wxTaskBarIconWindow;
|
|
|
|
class WXDLLIMPEXP_CORE wxTaskBarIcon : public wxTaskBarIconBase
|
|
{
|
|
public:
|
|
wxTaskBarIcon(wxTaskBarIconType iconType = wxTBI_DEFAULT_TYPE);
|
|
virtual ~wxTaskBarIcon();
|
|
|
|
// Accessors
|
|
bool IsOk() const { return true; }
|
|
bool IsIconInstalled() const { return m_iconAdded; }
|
|
|
|
// Operations
|
|
bool SetIcon(const wxIcon& icon, const wxString& tooltip = wxEmptyString) wxOVERRIDE;
|
|
bool RemoveIcon() wxOVERRIDE;
|
|
bool PopupMenu(wxMenu *menu) wxOVERRIDE;
|
|
|
|
// MSW-specific class methods
|
|
|
|
#if wxUSE_TASKBARICON_BALLOONS
|
|
// show a balloon notification (the icon must have been already initialized
|
|
// using SetIcon)
|
|
//
|
|
// title and text are limited to 63 and 255 characters respectively, msec
|
|
// is the timeout, in milliseconds, before the balloon disappears (will be
|
|
// clamped down to the allowed 10-30s range by Windows if it's outside it)
|
|
// and flags can include wxICON_ERROR/INFO/WARNING to show a corresponding
|
|
// icon
|
|
//
|
|
// return true if balloon was shown, false on error (incorrect parameters
|
|
// or function unsupported by OS)
|
|
bool ShowBalloon(const wxString& title,
|
|
const wxString& text,
|
|
unsigned msec = 0,
|
|
int flags = 0,
|
|
const wxIcon& icon = wxNullIcon);
|
|
#endif // wxUSE_TASKBARICON_BALLOONS
|
|
|
|
protected:
|
|
friend class wxTaskBarIconWindow;
|
|
|
|
long WindowProc(unsigned int msg, unsigned int wParam, long lParam);
|
|
void RegisterWindowMessages();
|
|
|
|
|
|
wxTaskBarIconWindow *m_win;
|
|
bool m_iconAdded;
|
|
wxIcon m_icon;
|
|
wxString m_strTooltip;
|
|
|
|
private:
|
|
enum Operation
|
|
{
|
|
Operation_Add,
|
|
Operation_Modify,
|
|
Operation_TryBoth
|
|
};
|
|
|
|
// Implementation of the public SetIcon() which may also be used when we
|
|
// don't know if we should add a new icon or modify the existing one.
|
|
bool DoSetIcon(const wxIcon& icon,
|
|
const wxString& tooltip,
|
|
Operation operation);
|
|
|
|
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxTaskBarIcon);
|
|
};
|
|
|
|
#endif // _WX_TASKBAR_H_
|