--- nono/wx/wxstatuspanel.h 2026/04/29 17:05:27 1.1.1.9 +++ nono/wx/wxstatuspanel.h 2026/04/29 17:05:48 1.1.1.11 @@ -30,11 +30,14 @@ class WXStatusPanel : public WXTextPanel ~WXStatusPanel() override; void FontChanged() override; + void Fit() override; + bool Layout() override; + + void Init(); private: void OnClose(wxCloseEvent&); void OnShow(wxShowEvent&); - void OnSize(wxSizeEvent&); void OnTimer(wxTimerEvent&); void OnLeftDClick(wxMouseEvent&); void OnContextMenu(wxContextMenuEvent&); @@ -45,7 +48,7 @@ class WXStatusPanel : public WXTextPanel bool UpdateStat(); void Draw() override; void InitIndicators(); - void LayoutIndicators(); + wxSize LayoutIndicators(); void DrawPerf(const Indicator *); void DrawSCSI(const Indicator *); void DrawVBlk(const Indicator *); @@ -68,6 +71,7 @@ class WXStatusPanel : public WXTextPanel // インジケータ表示用 bool ispower {}; bool powerled {}; + uint clock_khz {}; uint perf_mode {}; uint perf_rate {}; std::array scsi_loaded {};