mirrors/Cemu
0
0
Fork 0
mirror of https://github.com/cemu-project/Cemu.git synced 2025-12-18 10:36:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

UI: fix DoScroll for wxTextCtrl

Browse source
This commit is contained in:
Crementif 2025-07-07 23:05:41 +02:00
parent 1f688f4e7f
commit 4e6bb67e01
2 changed files with 31 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/gui/wxgui/components/TextList.cpp
View file

@ -1,5 +1,8 @@
#include "wxgui/wxgui.h" #include "wxgui/wxgui.h"
#include "TextList.h" #include "TextList.h"
#include "debugger/DisasmCtrl.h"
#include <wx/setup.h> #include <wx/setup.h>
#include <wx/tooltip.h> #include <wx/tooltip.h>
@ -18,13 +21,14 @@ TextList::~TextList()
this->Unbind(wxEVT_ERASE_BACKGROUND, &TextList::OnEraseBackground, this); this->Unbind(wxEVT_ERASE_BACKGROUND, &TextList::OnEraseBackground, this);
} }
TextList::TextList(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style) : wxScrolled<wxControl>(parent, id, pos, size, style) TextList::TextList(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style)
: wxControl(parent, id, pos, size, style), wxScrollHelper(this)
{ {
m_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); m_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
this->wxWindowBase::SetBackgroundStyle(wxBG_STYLE_PAINT); this->wxWindowBase::SetBackgroundStyle(wxBG_STYLE_PAINT);
wxInfoDC dc(this); wxInfoDC dc(this);
this->wxScrolled::DoPrepareReadOnlyDC(dc); this->DoPrepareReadOnlyDC(dc);
dc.SetFont(m_font); dc.SetFont(m_font);
m_line_height = dc.GetCharHeight(); m_line_height = dc.GetCharHeight();
m_char_width = dc.GetCharWidth(); m_char_width = dc.GetCharWidth();
@ -280,25 +284,37 @@ void TextList::OnPaintEvent(wxPaintEvent& event)
{ {
wxAutoBufferedPaintDC dc(m_targetWindow); wxAutoBufferedPaintDC dc(m_targetWindow);
// get window position
auto position = GetPosition();
// get current real position
wxRect rect_update = GetUpdateRegion().GetBox();
const auto count = (uint32)std::ceil((float)rect_update.GetHeight() / m_line_height);
position.y = (rect_update.y / m_line_height) * m_line_height;
// paint background
dc.SetFont(m_font); dc.SetFont(m_font);
const wxColour window_colour = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
dc.SetBrush(GetBackgroundColour()); dc.SetBrush(GetBackgroundColour());
dc.SetPen(*wxTRANSPARENT_PEN); dc.SetPen(*wxTRANSPARENT_PEN);
dc.DrawRectangle(GetUpdateRegion().GetBox()); dc.DrawRectangle(rect_update);
// calculate the number of elements visible in the current view //// paint selection
auto rect_update = GetClientRect(); //if (!m_selected_text.eof())
sint32 start = GetViewStart().y; //{
m_elements_visible = std::min(rect_update.height + m_line_height - 1, (sint32)m_element_count - start); // dc.SetBrush(*wxBLUE_BRUSH);
// dc.SetPen(*wxBLUE_PEN);
// dc.DrawRectangle(m_selection);
//}
// add constraints sint32 start;
if (m_elements_visible < 0) CalcUnscrolledPosition(rect_update.x, rect_update.y, nullptr, &start);
m_elements_visible = 0;
else if (m_elements_visible > m_element_count - start)
m_elements_visible = m_element_count - start;
m_scrolled_to_end = (start + m_elements_visible >= m_element_count); start /= m_line_height;
m_scrolled_to_end = (start + count) >= m_element_count;
OnDraw(dc, GetViewStart().y, m_elements_visible, wxPoint(rect_update.x, rect_update.y)); OnDraw(dc, start, count, position);
// removed Update() here since all text is white // removed Update() here since all text is white
} }

8
src/gui/wxgui/components/TextList.h
View file

@ -5,14 +5,8 @@
#include <unordered_map> #include <unordered_map>
#include <sstream> #include <sstream>
#define COLOR_BLACK 0xFF000000
#define COLOR_GREY 0xFFA0A0A0
#define COLOR_LIGHT_GREY 0xFFE0E0E0
#define COLOR_WHITE 0xFFFFFFFF
#define COLOR_RED 0xFF0000FF
class TextList : public wxControl, public wxScrollHelper
class TextList : public wxScrolled<wxControl>
{ {
public: public:
virtual ~TextList(); virtual ~TextList();