X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/072a81babe95096913a1f895481d4cf66285b654..16d865f756b8bc251467139b3b75752219ab97bd:/src/univ/themes/win32.cpp?ds=sidebyside diff --git a/src/univ/themes/win32.cpp b/src/univ/themes/win32.cpp index ead2d25ddd..4142f5940f 100644 --- a/src/univ/themes/win32.cpp +++ b/src/univ/themes/win32.cpp @@ -311,6 +311,7 @@ public: int flags = 0); virtual wxRect GetFrameClientArea(const wxRect& rect, int flags) const; virtual wxSize GetFrameTotalSize(const wxSize& clientSize, int flags) const; + virtual wxSize GetFrameMinSize(int flags) const; virtual wxSize GetFrameIconSize() const; virtual int HitTestFrame(const wxRect& rect, const wxPoint& pt, int flags) const; @@ -474,6 +475,14 @@ private: wxFont m_titlebarFont; + // the checked and unchecked bitmaps for DrawCheckItem() + wxBitmap m_bmpCheckBitmaps[IndicatorStatus_Max]; + + // the bitmaps returned by GetIndicator() + wxBitmap m_bmpIndicators[IndicatorType_Max] + [IndicatorState_Max] + [IndicatorStatus_Max]; + // titlebar icons: wxBitmap m_bmpFrameButtons[FrameButton_Max]; @@ -577,6 +586,16 @@ private: bool m_isOnGrip; }; +class wxWin32FrameInputHandler : public wxStdFrameInputHandler +{ +public: + wxWin32FrameInputHandler(wxInputHandler *handler) + : wxStdFrameInputHandler(handler) { } + + virtual bool HandleMouse(wxInputConsumer *control, + const wxMouseEvent& event); +}; + // ---------------------------------------------------------------------------- // wxWin32ColourScheme: uses (default) Win32 colours // ---------------------------------------------------------------------------- @@ -630,8 +649,8 @@ private: static const char *frame_button_close_xpm[] = { "12 10 2 1", -" c None", -". c black", +" c None", +". c black", " ", " .. .. ", " .. .. ", @@ -645,8 +664,8 @@ static const char *frame_button_close_xpm[] = { static const char *frame_button_help_xpm[] = { "12 10 2 1", -" c None", -". c #000000", +" c None", +". c #000000", " .... ", " .. .. ", " .. .. ", @@ -660,8 +679,8 @@ static const char *frame_button_help_xpm[] = { static const char *frame_button_maximize_xpm[] = { "12 10 2 1", -" c None", -". c #000000", +" c None", +". c #000000", " ......... ", " ......... ", " . . ", @@ -675,8 +694,8 @@ static const char *frame_button_maximize_xpm[] = { static const char *frame_button_minimize_xpm[] = { "12 10 2 1", -" c None", -". c #000000", +" c None", +". c #000000", " ", " ", " ", @@ -690,8 +709,8 @@ static const char *frame_button_minimize_xpm[] = { static const char *frame_button_restore_xpm[] = { "12 10 2 1", -" c None", -". c #000000", +" c None", +". c #000000", " ...... ", " ...... ", " . . ", @@ -1057,7 +1076,7 @@ static const char *pressed_unchecked_radio_xpm[] = { }; static const char ** - bmpIndicators[IndicatorType_Max][IndicatorState_Max][IndicatorStatus_Max] = + xpmIndicators[IndicatorType_Max][IndicatorState_Max][IndicatorStatus_Max] = { // checkboxes first { @@ -1099,6 +1118,12 @@ static const char ** } }; +static const char **xpmChecked[IndicatorStatus_Max] = +{ + checked_item_xpm, + unchecked_item_xpm +}; + // ============================================================================ // implementation // ============================================================================ @@ -1202,7 +1227,7 @@ wxInputHandler *wxWin32Theme::GetInputHandler(const wxString& control) handler = new wxWin32StatusBarInputHandler(GetDefaultInputHandler()); #endif // wxUSE_STATUSBAR else if ( control == wxINP_HANDLER_TOPLEVEL ) - handler = new wxStdFrameInputHandler(GetDefaultInputHandler()); + handler = new wxWin32FrameInputHandler(GetDefaultInputHandler()); else handler = GetDefaultInputHandler(); @@ -1297,7 +1322,7 @@ wxColour wxWin32ColourScheme::Get(wxWin32ColourScheme::StdColour col) const #if defined(COLOR_3DDKSHADOW) case SHADOW_DARK: return wxColour(GetSysColor(COLOR_3DDKSHADOW)); #else - case SHADOW_DARK: return *wxBLACK; + case SHADOW_DARK: return wxColour(GetSysColor(COLOR_3DHADOW)); #endif case CONTROL_TEXT_DISABLED: @@ -1312,7 +1337,7 @@ wxColour wxWin32ColourScheme::Get(wxWin32ColourScheme::StdColour col) const case TITLEBAR_ACTIVE: return wxColour(GetSysColor(COLOR_ACTIVECAPTION)); case TITLEBAR_TEXT: return wxColour(GetSysColor(COLOR_INACTIVECAPTIONTEXT)); case TITLEBAR_ACTIVE_TEXT: return wxColour(GetSysColor(COLOR_CAPTIONTEXT)); - + case DESKTOP: return wxColour(0x808000); #else // !__WXMSW__ // use the standard Windows colours elsewhere @@ -1348,6 +1373,8 @@ wxColour wxWin32ColourScheme::Get(wxWin32ColourScheme::StdColour col) const case DESKTOP: return wxColour(0x808000); #endif // __WXMSW__ + case GAUGE: return Get(HIGHLIGHT); + case MAX: default: wxFAIL_MSG(_T("invalid standard colour")); @@ -2158,8 +2185,16 @@ void wxWin32Renderer::DrawCheckItem(wxDC& dc, } else // use default bitmap { - bmp = wxBitmap(flags & wxCONTROL_CHECKED ? checked_item_xpm - : unchecked_item_xpm); + IndicatorStatus i = flags & wxCONTROL_CHECKED + ? IndicatorStatus_Checked + : IndicatorStatus_Unchecked; + + if ( !m_bmpCheckBitmaps[i].Ok() ) + { + m_bmpCheckBitmaps[i] = wxBitmap(xpmChecked[i]); + } + + bmp = m_bmpCheckBitmaps[i]; } dc.DrawBitmap(bmp, rect.x, rect.y + (rect.height - bmp.GetHeight()) / 2 - 1, @@ -2194,14 +2229,19 @@ wxBitmap wxWin32Renderer::GetIndicator(IndicatorType indType, int flags) ? IndicatorStatus_Checked : IndicatorStatus_Unchecked; - const char **xpm = bmpIndicators[indType][indState][indStatus]; - if (xpm) + wxBitmap bmp = m_bmpIndicators[indType][indState][indStatus]; + if ( !bmp.Ok() ) { - wxBitmap bmp(xpm); - return bmp; + const char **xpm = xpmIndicators[indType][indState][indStatus]; + if ( xpm ) + { + // create and cache it + bmp = wxBitmap(xpm); + m_bmpIndicators[indType][indState][indStatus] = bmp; + } } - else - return wxNullBitmap; + + return bmp; } void wxWin32Renderer::DrawCheckOrRadioButton(wxDC& dc, @@ -2260,19 +2300,16 @@ void wxWin32Renderer::DrawRadioButton(wxDC& dc, wxAlignment align, int indexAccel) { - if (bitmap.Ok()) - DrawCheckOrRadioButton(dc, label, - bitmap, - rect, flags, align, indexAccel, - FOCUS_RECT_OFFSET_Y); // default focus rect offset + wxBitmap bmp; + if ( bitmap.Ok() ) + bmp = bitmap; else - { - wxBitmap rbitmap(GetRadioBitmap(flags)); - DrawCheckOrRadioButton(dc, label, - rbitmap, + bmp = GetRadioBitmap(flags); + + DrawCheckOrRadioButton(dc, label, + bmp, rect, flags, align, indexAccel, - FOCUS_RECT_OFFSET_Y); // default focus rect offset - } + FOCUS_RECT_OFFSET_Y); // default focus rect offset } void wxWin32Renderer::DrawCheckButton(wxDC& dc, @@ -2283,19 +2320,16 @@ void wxWin32Renderer::DrawCheckButton(wxDC& dc, wxAlignment align, int indexAccel) { - if (bitmap.Ok()) - DrawCheckOrRadioButton(dc, label, - bitmap, - rect, flags, align, indexAccel, - 0); // no focus rect offset for checkboxes + wxBitmap bmp; + if ( bitmap.Ok() ) + bmp = bitmap; else - { - wxBitmap cbitmap(GetCheckBitmap(flags)); - DrawCheckOrRadioButton(dc, label, - cbitmap, - rect, flags, align, indexAccel, - 0); // no focus rect offset for checkboxes - } + bmp = GetCheckBitmap(flags); + + DrawCheckOrRadioButton(dc, label, + bmp, + rect, flags, align, indexAccel, + 0); // no focus rect offset for checkboxes } // ---------------------------------------------------------------------------- @@ -3409,13 +3443,62 @@ void wxWin32Renderer::DrawFrameTitle(wxDC& dc, wxRect r = GetFrameClientArea(rect, flags & ~wxTOPLEVEL_TITLEBAR); r.height = FRAME_TITLEBAR_HEIGHT; if ( flags & wxTOPLEVEL_ICON ) + { r.x += FRAME_TITLEBAR_HEIGHT; + r.width -= FRAME_TITLEBAR_HEIGHT + 2; + } else + { r.x += 1; + r.width -= 3; + } + + if ( flags & wxTOPLEVEL_BUTTON_CLOSE ) + r.width -= FRAME_BUTTON_WIDTH + 2; + if ( flags & wxTOPLEVEL_BUTTON_MAXIMIZE ) + r.width -= FRAME_BUTTON_WIDTH; + if ( flags & wxTOPLEVEL_BUTTON_RESTORE ) + r.width -= FRAME_BUTTON_WIDTH; + if ( flags & wxTOPLEVEL_BUTTON_ICONIZE ) + r.width -= FRAME_BUTTON_WIDTH; + if ( flags & wxTOPLEVEL_BUTTON_HELP ) + r.width -= FRAME_BUTTON_WIDTH; dc.SetFont(m_titlebarFont); dc.SetTextForeground(col); - dc.DrawLabel(title, wxNullBitmap, r, wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL); + + wxCoord textW; + dc.GetTextExtent(title, &textW, NULL); + if ( textW > r.width ) + { + // text is too big, let's shorten it and add "..." after it: + size_t len = title.length(); + wxCoord WSoFar, letterW; + + dc.GetTextExtent(wxT("..."), &WSoFar, NULL); + if ( WSoFar > r.width ) + { + // not enough space to draw anything + return; + } + + wxString s; + s.Alloc(len); + for (size_t i = 0; i < len; i++) + { + dc.GetTextExtent(title[i], &letterW, NULL); + if ( letterW + WSoFar > r.width ) + break; + WSoFar += letterW; + s << title[i]; + } + s << wxT("..."); + dc.DrawLabel(s, wxNullBitmap, r, + wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL); + } + else + dc.DrawLabel(title, wxNullBitmap, r, + wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL); } void wxWin32Renderer::DrawFrameIcon(wxDC& dc, @@ -3506,6 +3589,40 @@ wxSize wxWin32Renderer::GetFrameTotalSize(const wxSize& clientSize, return s; } +wxSize wxWin32Renderer::GetFrameMinSize(int flags) const +{ + wxSize s(0, 0); + + if ( (flags & wxTOPLEVEL_BORDER) && !(flags & wxTOPLEVEL_MAXIMIZED) ) + { + int border = (flags & wxTOPLEVEL_RESIZEABLE) ? + RESIZEABLE_FRAME_BORDER_THICKNESS : + FRAME_BORDER_THICKNESS; + s.x += 2*border; + s.y += 2*border; + } + + if ( flags & wxTOPLEVEL_TITLEBAR ) + { + s.y += FRAME_TITLEBAR_HEIGHT; + + if ( flags & wxTOPLEVEL_ICON ) + s.x += FRAME_TITLEBAR_HEIGHT + 2; + if ( flags & wxTOPLEVEL_BUTTON_CLOSE ) + s.x += FRAME_BUTTON_WIDTH + 2; + if ( flags & wxTOPLEVEL_BUTTON_MAXIMIZE ) + s.x += FRAME_BUTTON_WIDTH; + if ( flags & wxTOPLEVEL_BUTTON_RESTORE ) + s.x += FRAME_BUTTON_WIDTH; + if ( flags & wxTOPLEVEL_BUTTON_ICONIZE ) + s.x += FRAME_BUTTON_WIDTH; + if ( flags & wxTOPLEVEL_BUTTON_HELP ) + s.x += FRAME_BUTTON_WIDTH; + } + + return s; +} + wxSize wxWin32Renderer::GetFrameIconSize() const { return wxSize(16, 16); @@ -3818,6 +3935,7 @@ bool wxWin32InputHandler::HandleMouse(wxInputConsumer *control, if ( event.ButtonDown() ) { wxWindow *win = control->GetInputWindow(); + if ( wxWindow::FindFocus() != control->GetInputWindow() ) { win->SetFocus(); @@ -4088,12 +4206,27 @@ bool wxWin32StatusBarInputHandler::IsOnGrip(wxWindow *statbar, const wxPoint& pt) const { if ( statbar->HasFlag(wxST_SIZEGRIP) && - statbar->GetParent()->HasFlag(wxRESIZE_BORDER) ) + statbar->GetParent()->HasFlag(wxRESIZE_BORDER) ) { - wxSize sizeSbar = statbar->GetSize(); + wxTopLevelWindow * + parentTLW = wxDynamicCast(statbar->GetParent(), wxTopLevelWindow); + + wxCHECK_MSG( parentTLW, FALSE, + _T("the status bar should be a child of a TLW") ); - return (sizeSbar.x - pt.x) < (wxCoord)STATUSBAR_GRIP_SIZE && - (sizeSbar.y - pt.y) < (wxCoord)STATUSBAR_GRIP_SIZE; + // a maximized window can't be resized anyhow + if ( !parentTLW->IsMaximized() ) + { + // VZ: I think that the standard Windows behaviour is to only + // show the resizing cursor when the mouse is on top of the + // grip itself but apparently different Windows versions behave + // differently (?) and it seems a better UI to allow resizing + // the status bar even when the mouse is above the grip + wxSize sizeSbar = statbar->GetSize(); + + int diff = sizeSbar.x - pt.x; + return diff >= 0 && diff < (wxCoord)STATUSBAR_GRIP_SIZE; + } } return FALSE; @@ -4151,3 +4284,29 @@ bool wxWin32StatusBarInputHandler::HandleMouseMove(wxInputConsumer *consumer, return wxStdInputHandler::HandleMouseMove(consumer, event); } +// ---------------------------------------------------------------------------- +// wxWin32FrameInputHandler +// ---------------------------------------------------------------------------- + +bool wxWin32FrameInputHandler::HandleMouse(wxInputConsumer *consumer, + const wxMouseEvent& event) +{ + if ( event.LeftDClick() ) + { + wxTopLevelWindow *tlw = + wxStaticCast(consumer->GetInputWindow(), wxTopLevelWindow); + + long hit = tlw->HitTest(event.GetPosition()); + + if ( hit == wxHT_TOPLEVEL_TITLEBAR ) + { + tlw->PerformAction(wxACTION_TOPLEVEL_BUTTON_CLICK, + tlw->IsMaximized() ? wxTOPLEVEL_BUTTON_RESTORE + : wxTOPLEVEL_BUTTON_MAXIMIZE); + return TRUE; + } + } + + return wxStdFrameInputHandler::HandleMouse(consumer, event); +} +