From 413fbbf40bb00fb1a47425924ba768e21ccd3ea3 Mon Sep 17 00:00:00 2001 From: Mirek Fidler Date: Wed, 26 Nov 2025 15:42:13 +0100 Subject: [PATCH] ide, CtrlLib: BeginnerInfo renamed to BasicHints, tuned mouse move --- uppsrc/CtrlLib/BeginnerInfo.cpp | 32 +++++++++++++++---------------- uppsrc/CtrlLib/CtrlUtil.h | 16 ++++++++-------- uppsrc/RichEdit/DiagramEditor.cpp | 2 +- uppsrc/ide/Assist.cpp | 2 +- uppsrc/ide/Config.cpp | 4 ++-- uppsrc/ide/IconDes/Paint.cpp | 4 ++-- uppsrc/ide/LayDes/laydes.cpp | 2 +- uppsrc/ide/Setup.cpp | 4 ++-- 8 files changed, 33 insertions(+), 33 deletions(-) diff --git a/uppsrc/CtrlLib/BeginnerInfo.cpp b/uppsrc/CtrlLib/BeginnerInfo.cpp index 6c536b585..0c2cf4134 100644 --- a/uppsrc/CtrlLib/BeginnerInfo.cpp +++ b/uppsrc/CtrlLib/BeginnerInfo.cpp @@ -4,17 +4,17 @@ namespace Upp { static bool s_beginner_info_enabled = true; -void EnableBeginnerInfo(bool b) +void EnableBasicHints(bool b) { s_beginner_info_enabled = b; } -bool IsBeginnerInfoEnabled() +bool IsBasicHintsEnabled() { return s_beginner_info_enabled; } -void PaintBeginnerInfo(Draw& w, const Rect& cr, const char *qtf) +void PaintBasicHints(Draw& w, const Rect& cr, const char *qtf) { if(!s_beginner_info_enabled) return; @@ -33,12 +33,12 @@ void PaintBeginnerInfo(Draw& w, const Rect& cr, const char *qtf) text.Paint(w, r.left + DPI(4), r.top + DPI(4), cx); } -void PaintBeginnerInfoTopic(Draw& w, Size sz, const char *topic) +void PaintBasicHintsTopic(Draw& w, Size sz, const char *topic) { - PaintBeginnerInfo(w, sz, GetTopic(topic)); + PaintBasicHints(w, sz, GetTopic(topic)); } -void PaintBeginnerInfo(Ctrl *ctrl, Draw& w, const Rect& cr, const char *qtf, const char *key) +void PaintBasicHints(Ctrl *ctrl, Draw& w, const Rect& cr, const char *qtf, const char *key) { static Index done_keys; @@ -48,7 +48,7 @@ void PaintBeginnerInfo(Ctrl *ctrl, Draw& w, const Rect& cr, const char *qtf, con struct Record : Moveable { Ptr ctrl; String key; - Point mousepos; + int movecount; int tm; }; @@ -66,7 +66,7 @@ void PaintBeginnerInfo(Ctrl *ctrl, Draw& w, const Rect& cr, const char *qtf, con Record& r = records.Add(); r.ctrl = ctrl; r.key = key; - r.mousepos = GetMousePos(); + r.movecount = 0; r.tm = msecs(); } @@ -82,7 +82,7 @@ void PaintBeginnerInfo(Ctrl *ctrl, Draw& w, const Rect& cr, const char *qtf, con if(testmousepos) mousepos = GetMousePos(); for(Record& r : records) { - if(testmousepos && Distance(r.mousepos, mousepos) < DPI(200)) + if(testmousepos && r.movecount++ < 40) continue; if(tm - r.tm > 250) { if(r.ctrl) { @@ -110,22 +110,22 @@ void PaintBeginnerInfo(Ctrl *ctrl, Draw& w, const Rect& cr, const char *qtf, con }); } - PaintBeginnerInfo(w, cr, qtf); + PaintBasicHints(w, cr, qtf); } -void PaintBeginnerInfo(Ctrl *ctrl, Draw& w, const char *qtf, const char *key) +void PaintBasicHints(Ctrl *ctrl, Draw& w, const char *qtf, const char *key) { - PaintBeginnerInfo(ctrl, w, ctrl->GetSize(), qtf, key); + PaintBasicHints(ctrl, w, ctrl->GetSize(), qtf, key); } -void PaintBeginnerInfoTopic(Ctrl *ctrl, Draw& w, const Rect& cr, const char *topic) +void PaintBasicHintsTopic(Ctrl *ctrl, Draw& w, const Rect& cr, const char *topic) { - PaintBeginnerInfo(ctrl, w, cr, GetTopic(topic), topic); + PaintBasicHints(ctrl, w, cr, GetTopic(topic), topic); } -void PaintBeginnerInfoTopic(Ctrl *ctrl, Draw& w, const char *topic) +void PaintBasicHintsTopic(Ctrl *ctrl, Draw& w, const char *topic) { - PaintBeginnerInfo(ctrl, w, ctrl->GetSize(), GetTopic(topic), topic); + PaintBasicHints(ctrl, w, ctrl->GetSize(), GetTopic(topic), topic); } } \ No newline at end of file diff --git a/uppsrc/CtrlLib/CtrlUtil.h b/uppsrc/CtrlLib/CtrlUtil.h index 9695629c7..58604fc4a 100644 --- a/uppsrc/CtrlLib/CtrlUtil.h +++ b/uppsrc/CtrlLib/CtrlUtil.h @@ -537,16 +537,16 @@ void DrawRoundRect(Draw& w, const Rect& r, int radius, Color fill, void DrawRoundRect(Draw& w, int x, int y, int cx, int cy, int radius, Color fill, int stroke_width, Color stroke); -void EnableBeginnerInfo(bool b); -bool IsBeginnerInfoEnabled(); +void EnableBasicHints(bool b); +bool IsBasicHintsEnabled(); -void PaintBeginnerInfo(Draw& w, const Rect& cr, const char *qtf); -void PaintBeginnerInfoTopic(Draw& w, Size sz, const char *topic); +void PaintBasicHints(Draw& w, const Rect& cr, const char *qtf); +void PaintBasicHintsTopic(Draw& w, Size sz, const char *topic); -void PaintBeginnerInfo(Ctrl *ctrl, Draw& w, const Rect& cr, const char *qtf, const char *key); -void PaintBeginnerInfo(Ctrl *ctrl, Draw& w, const char *qtf, const char *key); -void PaintBeginnerInfoTopic(Ctrl *ctrl, Draw& w, const Rect& cr, const char *topic); -void PaintBeginnerInfoTopic(Ctrl *ctrl, Draw& w, const char *topic); +void PaintBasicHints(Ctrl *ctrl, Draw& w, const Rect& cr, const char *qtf, const char *key); +void PaintBasicHints(Ctrl *ctrl, Draw& w, const char *qtf, const char *key); +void PaintBasicHintsTopic(Ctrl *ctrl, Draw& w, const Rect& cr, const char *topic); +void PaintBasicHintsTopic(Ctrl *ctrl, Draw& w, const char *topic); void Set(ArrayCtrl& array, int ii, IdCtrls& m); void Get(ArrayCtrl& array, int ii, IdCtrls& m); diff --git a/uppsrc/RichEdit/DiagramEditor.cpp b/uppsrc/RichEdit/DiagramEditor.cpp index 4cc3d2cec..ea791ed54 100644 --- a/uppsrc/RichEdit/DiagramEditor.cpp +++ b/uppsrc/RichEdit/DiagramEditor.cpp @@ -141,7 +141,7 @@ void DiagramEditor::Paint(Draw& w) if(!fast) paint_ms = msecs() - t0; - PaintBeginnerInfo(this, w, "Right-click to insert item(s)&Double-click to edit text", "#DiagramEditor"); + PaintBasicHints(this, w, "Right-click to insert item(s)&Double-click to edit text", "#DiagramEditor"); } void DiagramEditor::Sync() diff --git a/uppsrc/ide/Assist.cpp b/uppsrc/ide/Assist.cpp index 292b84358..e00288086 100644 --- a/uppsrc/ide/Assist.cpp +++ b/uppsrc/ide/Assist.cpp @@ -84,7 +84,7 @@ void AssistEditor::EndBeginnerInfo() void AssistEditor::Paint(Draw& w) { CodeEditor::Paint(w); - PaintBeginnerInfoTopic(this, w, "ide/app/EditorBeginnerInfo_en-us"); + PaintBasicHintsTopic(this, w, "ide/app/EditorBeginnerInfo_en-us"); } class IndexSeparatorFrameCls : public CtrlFrame { diff --git a/uppsrc/ide/Config.cpp b/uppsrc/ide/Config.cpp index 7568db26d..3b91fe91b 100644 --- a/uppsrc/ide/Config.cpp +++ b/uppsrc/ide/Config.cpp @@ -390,9 +390,9 @@ void Ide::Serialize(Stream& s) s % blk0_header; if(version >= 34) { - bool b = IsBeginnerInfoEnabled(); + bool b = IsBasicHintsEnabled(); s % b; - EnableBeginnerInfo(b); + EnableBasicHints(b); } #ifdef PLATFORM_WIN32 diff --git a/uppsrc/ide/IconDes/Paint.cpp b/uppsrc/ide/IconDes/Paint.cpp index 44cb42221..7ec024720 100644 --- a/uppsrc/ide/IconDes/Paint.cpp +++ b/uppsrc/ide/IconDes/Paint.cpp @@ -110,7 +110,7 @@ void IconDes::Paint(Draw& w) Size sz = GetSize(); if(!IsCurrent()) { w.DrawRect(sz, SColorPaper()); - PaintBeginnerInfoTopic(this, w, "ide/app/ImlBeginnerInfo_en-us"); + PaintBasicHintsTopic(this, w, "ide/app/ImlBeginnerInfo_en-us"); return; } const Image& image = Current().image; @@ -269,5 +269,5 @@ void IconDes::Paint(Draw& w) PaintHotSpot(image.Get2ndSpot(), LtBlue()); } - PaintBeginnerInfoTopic(this, w, "ide/app/ImlBeginnerInfo_en-us"); + PaintBasicHintsTopic(this, w, "ide/app/ImlBeginnerInfo_en-us"); } diff --git a/uppsrc/ide/LayDes/laydes.cpp b/uppsrc/ide/LayDes/laydes.cpp index 4fe74a1cc..c73aaac24 100644 --- a/uppsrc/ide/LayDes/laydes.cpp +++ b/uppsrc/ide/LayDes/laydes.cpp @@ -338,7 +338,7 @@ void LayDes::Paint(Draw& w) } } - PaintBeginnerInfoTopic(this, w, "ide/app/LayBeginnerInfo_en-us"); + PaintBasicHintsTopic(this, w, "ide/app/LayBeginnerInfo_en-us"); } void LayDes::SaveState() diff --git a/uppsrc/ide/Setup.cpp b/uppsrc/ide/Setup.cpp index ff4aad6e8..ca52530ee 100644 --- a/uppsrc/ide/Setup.cpp +++ b/uppsrc/ide/Setup.cpp @@ -385,7 +385,7 @@ void Ide::SetupFormat() { } #endif - bool show_basic_hints = IsBeginnerInfoEnabled(); + bool show_basic_hints = IsBasicHintsEnabled(); rtvr (hlt.hilite_scope, hs) @@ -541,7 +541,7 @@ void Ide::SetupFormat() { web_search.Save(); - EnableBeginnerInfo(show_basic_hints); + EnableBasicHints(show_basic_hints); if(c == IDEXIT) break;