Mageia Bugzilla – Attachment 13989 Details for
Bug 32231
guayadeque crashes inside Mageia9 when "enable volume and fader" is activated in settings
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
[patch]
guayadeque-0.4.6-wxgtk3.1.6.patch
guayadeque-0.4.6-wxgtk3.1.6.patch (text/plain), 1.98 KB, created by
Philippe Didier
on 2023-09-13 16:22:09 CEST
(
hide
)
Description:
guayadeque-0.4.6-wxgtk3.1.6.patch
Filename:
MIME Type:
Creator:
Philippe Didier
Created:
2023-09-13 16:22:09 CEST
Size:
1.98 KB
patch
obsolete
>diff --git a/src/ui/aui/AuiNotebook.cpp b/src/ui/aui/AuiNotebook.cpp >index f8178e4..db20422 100644 >--- a/src/ui/aui/AuiNotebook.cpp >+++ b/src/ui/aui/AuiNotebook.cpp >@@ -26,6 +26,7 @@ > #include "Utils.h" > > #include <wx/dc.h> >+#include <wx/bmpbndl.h> > > namespace Guayadeque { > >@@ -293,7 +294,7 @@ void guAuiTabArt::DrawTab(wxDC &dc, wxWindow * wnd, const wxAuiNotebookPage &pag > int close_button_width = 0; > if( close_button_state != wxAUI_BUTTON_STATE_HIDDEN ) > { >- close_button_width = m_activeCloseBmp.GetWidth(); >+ close_button_width = m_activeCloseBmp.GetBitmap(wxDefaultSize).GetWidth(); > } > > >@@ -303,12 +304,12 @@ void guAuiTabArt::DrawTab(wxDC &dc, wxWindow * wnd, const wxAuiNotebookPage &pag > bitmap_offset = tab_x + 8; > > // draw bitmap >- dc.DrawBitmap(page.bitmap, >+ dc.DrawBitmap(page.bitmap.GetBitmap(wxDefaultSize), > bitmap_offset, >- drawn_tab_yoff + (drawn_tab_height/2) - (page.bitmap.GetHeight()/2), >+ drawn_tab_yoff + (drawn_tab_height/2) - (page.bitmap.GetBitmap(wxDefaultSize).GetHeight()/2), > true); > >- text_offset = bitmap_offset + page.bitmap.GetWidth(); >+ text_offset = bitmap_offset + page.bitmap.GetBitmap(wxDefaultSize).GetWidth(); > text_offset += 3; // bitmap padding > } > else >@@ -331,12 +332,12 @@ void guAuiTabArt::DrawTab(wxDC &dc, wxWindow * wnd, const wxAuiNotebookPage &pag > // draw close button if necessary > if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN) > { >- wxBitmap bmp = m_disabledCloseBmp; >+ wxBitmap bmp = m_disabledCloseBmp.GetBitmap(wxDefaultSize); > > if (close_button_state == wxAUI_BUTTON_STATE_HOVER || > close_button_state == wxAUI_BUTTON_STATE_PRESSED) > { >- bmp = m_activeCloseBmp; >+ bmp = m_activeCloseBmp.GetBitmap(wxDefaultSize); > } > > wxRect rect(tab_x + tab_width - close_button_width - 1,
diff --git a/src/ui/aui/AuiNotebook.cpp b/src/ui/aui/AuiNotebook.cpp index f8178e4..db20422 100644 --- a/src/ui/aui/AuiNotebook.cpp +++ b/src/ui/aui/AuiNotebook.cpp @@ -26,6 +26,7 @@ #include "Utils.h" #include <wx/dc.h> +#include <wx/bmpbndl.h> namespace Guayadeque { @@ -293,7 +294,7 @@ void guAuiTabArt::DrawTab(wxDC &dc, wxWindow * wnd, const wxAuiNotebookPage &pag int close_button_width = 0; if( close_button_state != wxAUI_BUTTON_STATE_HIDDEN ) { - close_button_width = m_activeCloseBmp.GetWidth(); + close_button_width = m_activeCloseBmp.GetBitmap(wxDefaultSize).GetWidth(); } @@ -303,12 +304,12 @@ void guAuiTabArt::DrawTab(wxDC &dc, wxWindow * wnd, const wxAuiNotebookPage &pag bitmap_offset = tab_x + 8; // draw bitmap - dc.DrawBitmap(page.bitmap, + dc.DrawBitmap(page.bitmap.GetBitmap(wxDefaultSize), bitmap_offset, - drawn_tab_yoff + (drawn_tab_height/2) - (page.bitmap.GetHeight()/2), + drawn_tab_yoff + (drawn_tab_height/2) - (page.bitmap.GetBitmap(wxDefaultSize).GetHeight()/2), true); - text_offset = bitmap_offset + page.bitmap.GetWidth(); + text_offset = bitmap_offset + page.bitmap.GetBitmap(wxDefaultSize).GetWidth(); text_offset += 3; // bitmap padding } else @@ -331,12 +332,12 @@ void guAuiTabArt::DrawTab(wxDC &dc, wxWindow * wnd, const wxAuiNotebookPage &pag // draw close button if necessary if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN) { - wxBitmap bmp = m_disabledCloseBmp; + wxBitmap bmp = m_disabledCloseBmp.GetBitmap(wxDefaultSize); if (close_button_state == wxAUI_BUTTON_STATE_HOVER || close_button_state == wxAUI_BUTTON_STATE_PRESSED) { - bmp = m_activeCloseBmp; + bmp = m_activeCloseBmp.GetBitmap(wxDefaultSize); } wxRect rect(tab_x + tab_width - close_button_width - 1,
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 32231
:
13965
|
13973
|
13974
|
13988
|
13989
|
13990
|
13991
|
13992
|
13993
|
13998
|
14114
|
14148
|
14152
|
14153
|
14157
|
14158
|
14159
|
14160
|
14161
|
14162
|
14163
|
14164
|
14165
|
14166