0c2956be09
Don't apply the scaling factor twice when dynamically creating the close button bitmap. Closes https://github.com/wxWidgets/wxWidgets/pull/1063 Closes #18283.
160 lines
4.6 KiB
C++
160 lines
4.6 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: src/common/bmpbtncmn.cpp
|
|
// Purpose: wxBitmapButton common code
|
|
// Author: Julian Smart
|
|
// Modified by:
|
|
// Created: 04/01/98
|
|
// Copyright: (c) Julian Smart
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
// For compilers that support precompilation, includes "wx.h".
|
|
#include "wx/wxprec.h"
|
|
|
|
#ifdef __BORLANDC__
|
|
#pragma hdrstop
|
|
#endif
|
|
|
|
#if wxUSE_BMPBUTTON
|
|
|
|
#include "wx/bmpbuttn.h"
|
|
|
|
#ifndef WX_PRECOMP
|
|
#include "wx/log.h"
|
|
#include "wx/dcmemory.h"
|
|
#include "wx/image.h"
|
|
#endif
|
|
|
|
#include "wx/artprov.h"
|
|
#include "wx/renderer.h"
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// XTI
|
|
// ----------------------------------------------------------------------------
|
|
|
|
wxDEFINE_FLAGS( wxBitmapButtonStyle )
|
|
wxBEGIN_FLAGS( wxBitmapButtonStyle )
|
|
// new style border flags, we put them first to
|
|
// use them for streaming out
|
|
wxFLAGS_MEMBER(wxBORDER_SIMPLE)
|
|
wxFLAGS_MEMBER(wxBORDER_SUNKEN)
|
|
wxFLAGS_MEMBER(wxBORDER_DOUBLE)
|
|
wxFLAGS_MEMBER(wxBORDER_RAISED)
|
|
wxFLAGS_MEMBER(wxBORDER_STATIC)
|
|
wxFLAGS_MEMBER(wxBORDER_NONE)
|
|
|
|
// old style border flags
|
|
wxFLAGS_MEMBER(wxSIMPLE_BORDER)
|
|
wxFLAGS_MEMBER(wxSUNKEN_BORDER)
|
|
wxFLAGS_MEMBER(wxDOUBLE_BORDER)
|
|
wxFLAGS_MEMBER(wxRAISED_BORDER)
|
|
wxFLAGS_MEMBER(wxSTATIC_BORDER)
|
|
wxFLAGS_MEMBER(wxBORDER)
|
|
|
|
// standard window styles
|
|
wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
|
|
wxFLAGS_MEMBER(wxCLIP_CHILDREN)
|
|
wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
|
|
wxFLAGS_MEMBER(wxWANTS_CHARS)
|
|
wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
|
|
wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
|
|
wxFLAGS_MEMBER(wxVSCROLL)
|
|
wxFLAGS_MEMBER(wxHSCROLL)
|
|
|
|
wxFLAGS_MEMBER(wxBU_AUTODRAW)
|
|
wxFLAGS_MEMBER(wxBU_LEFT)
|
|
wxFLAGS_MEMBER(wxBU_RIGHT)
|
|
wxFLAGS_MEMBER(wxBU_TOP)
|
|
wxFLAGS_MEMBER(wxBU_BOTTOM)
|
|
wxEND_FLAGS( wxBitmapButtonStyle )
|
|
|
|
wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxBitmapButton, wxButton, "wx/bmpbuttn.h");
|
|
|
|
wxBEGIN_PROPERTIES_TABLE(wxBitmapButton)
|
|
wxPROPERTY_FLAGS( WindowStyle, wxBitmapButtonStyle, long, \
|
|
SetWindowStyleFlag, GetWindowStyleFlag, \
|
|
wxEMPTY_PARAMETER_VALUE, 0 /*flags*/, wxT("Helpstring"), \
|
|
wxT("group")) // style
|
|
wxEND_PROPERTIES_TABLE()
|
|
|
|
wxEMPTY_HANDLERS_TABLE(wxBitmapButton)
|
|
|
|
wxCONSTRUCTOR_5( wxBitmapButton, wxWindow*, Parent, wxWindowID, Id, \
|
|
wxBitmap, Bitmap, wxPoint, Position, wxSize, Size )
|
|
|
|
/*
|
|
TODO PROPERTIES :
|
|
|
|
long "style" , wxBU_AUTODRAW
|
|
bool "default" , 0
|
|
bitmap "selected" ,
|
|
bitmap "focus" ,
|
|
bitmap "disabled" ,
|
|
*/
|
|
|
|
namespace
|
|
{
|
|
|
|
#ifdef wxHAS_DRAW_TITLE_BAR_BITMAP
|
|
|
|
wxBitmap
|
|
GetCloseButtonBitmap(wxWindow *win,
|
|
const wxSize& size,
|
|
const wxColour& colBg,
|
|
int flags = 0)
|
|
{
|
|
// size is physical here because it comes from wxArtProvider::GetSizeHint
|
|
wxBitmap bmp;
|
|
bmp.Create(size.x, size.y, wxBITMAP_SCREEN_DEPTH);
|
|
wxMemoryDC dc(bmp);
|
|
dc.SetBackground(colBg);
|
|
dc.Clear();
|
|
wxRendererNative::Get().DrawTitleBarBitmap(win, dc, size, wxTITLEBAR_BUTTON_CLOSE, flags);
|
|
return bmp;
|
|
}
|
|
|
|
#endif // wxHAS_DRAW_TITLE_BAR_BITMAP
|
|
|
|
} // anonymous namespace
|
|
|
|
/* static */
|
|
wxBitmapButton*
|
|
wxBitmapButtonBase::NewCloseButton(wxWindow* parent, wxWindowID winid)
|
|
{
|
|
wxCHECK_MSG( parent, NULL, wxS("Must have a valid parent") );
|
|
|
|
const wxColour colBg = parent->GetBackgroundColour();
|
|
|
|
#ifdef wxHAS_DRAW_TITLE_BAR_BITMAP
|
|
const wxSize sizeBmp = wxArtProvider::GetSizeHint(wxART_BUTTON);
|
|
wxBitmap bmp = GetCloseButtonBitmap(parent, sizeBmp, colBg);
|
|
#else // !wxHAS_DRAW_TITLE_BAR_BITMAP
|
|
wxBitmap bmp = wxArtProvider::GetBitmap(wxART_CLOSE, wxART_BUTTON);
|
|
#endif // wxHAS_DRAW_TITLE_BAR_BITMAP
|
|
|
|
wxBitmapButton* const button = new wxBitmapButton
|
|
(
|
|
parent,
|
|
winid,
|
|
bmp,
|
|
wxDefaultPosition,
|
|
wxDefaultSize,
|
|
wxBORDER_NONE
|
|
);
|
|
|
|
#ifdef wxHAS_DRAW_TITLE_BAR_BITMAP
|
|
button->SetBitmapPressed(
|
|
GetCloseButtonBitmap(parent, sizeBmp, colBg, wxCONTROL_PRESSED));
|
|
|
|
button->SetBitmapCurrent(
|
|
GetCloseButtonBitmap(parent, sizeBmp, colBg, wxCONTROL_CURRENT));
|
|
#endif // wxHAS_DRAW_TITLE_BAR_BITMAP
|
|
|
|
// The button should blend with its parent background.
|
|
button->SetBackgroundColour(colBg);
|
|
|
|
return button;
|
|
}
|
|
|
|
#endif // wxUSE_BMPBUTTON
|