From 58ab3e1abd09e2ec8977f19ceecf5458552af89c Mon Sep 17 00:00:00 2001 From: jiajia_deng <2894220@gmail.com> Date: Wed, 17 Jul 2019 15:55:56 +0800 Subject: [PATCH] Update docs about control switching focus Signed-off-by: jiajia_deng <2894220@gmail.com> --- .github/ISSUE_TEMPLATE/bug_report.md | 14 ++--- .github/ISSUE_TEMPLATE/feature_request.md | 10 ++-- README.md | 3 +- README_en-US.md | 3 +- docs/Controls/Control.md | 12 ++++ docs/Controls/Window.md | 67 +++++------------------ 6 files changed, 41 insertions(+), 68 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index fc60b18b..902d9288 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -1,14 +1,14 @@ ---- -name: 缺陷反馈 -about: 提供一个缺陷复现步骤帮助我们修复问题 +锘--- +name: 缂洪櫡鍙嶉 +about: 鎻愪緵涓涓己闄峰鐜版楠ゅ府鍔╂垜浠慨澶嶉棶棰 --- - - + + -## 问题现象 +## 闂鐜拌薄 -## 重现步骤 +## 閲嶇幇姝ラ 1. 2. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index 5ee59ecd..0c6bd938 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -1,8 +1,8 @@ ---- -name: 功能建议 -about: 提交任何好的建议帮助我们完善项目 +锘--- +name: 鍔熻兘寤鸿 +about: 鎻愪氦浠讳綍濂界殑寤鸿甯姪鎴戜滑瀹屽杽椤圭洰 --- - + - + diff --git a/README.md b/README.md index 366c8a9a..a9201c8a 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ NIM Duilib 鍖呭惈浜嗕竴鏁村妗岄潰杞欢鐨勫紑鍙戦儴浠讹紝涓庡叾璇磋繖鏄竴涓晫闈㈠簱锛屼笉濡傝瀹冩槸涓涓紑鍙戞鏋躲備粠鍘熸湁 Duilib 鍩虹涓婃嫇灞曚簡涓浜涙柊鐨勮兘鍔涳紝骞舵暣鍚堜簡 Google base 鍩虹绫诲簱锛堢嚎绋嬨佸唴瀛樸侀棴鍖呯瓑锛夈傛偍瀹屽叏鍙互鐩存帴浣跨敤杩欎釜妗嗘灦鏉ュ紑鍙戜换浣曚綘鎯宠鐨勬闈㈠簲鐢ㄣ ![GitHub](https://img.shields.io/badge/license-MIT-green.svg) -![Build status](https://ci.appveyor.com/api/projects/status/u29yl0j7pasopm3h/branch/master?svg=true) +[![Build status](https://ci.appveyor.com/api/projects/status/u29yl0j7pasopm3h?svg=true)](https://ci.appveyor.com/project/nmgwddj/nim-duilib-framework) [English](README_en-US.md) @@ -33,6 +33,7 @@ git clone https://github.com/netease-im/NIM_Duilib_Framework ## 鏂囨。 + - [蹇熶笂鎵媇(docs/GETTING-STARTED.md) - [涓枃鏂囨。](docs/SUMMARY.md) ## 鐩綍 diff --git a/README_en-US.md b/README_en-US.md index 19cf57bd..f8093eb8 100644 --- a/README_en-US.md +++ b/README_en-US.md @@ -3,7 +3,7 @@ NIM Duilib is a UI development framework for Windows, extend some new features based on the original [Duilib](https://github.com/duilib/duilib). Integrated Google base library with threads/memory/closures. You can use this framework to develop any desktop application you want. ![GitHub](https://img.shields.io/badge/license-MIT-green.svg) -![Build status](https://ci.appveyor.com/api/projects/status/u29yl0j7pasopm3h/branch/master?svg=true) +[![Build status](https://ci.appveyor.com/api/projects/status/u29yl0j7pasopm3h?svg=true)](https://ci.appveyor.com/project/nmgwddj/nim-duilib-framework) [涓枃浠嬬粛](README.md) @@ -33,6 +33,7 @@ Enter the `NIM_Duilib_Framework/samples` directory锛孫pen `samples.sln` with Vis ## Documentation + - [Getting Started](docs/GETTING-STARTED.md) - [Docs](docs/SUMMARY.md) ## Structure diff --git a/docs/Controls/Control.md b/docs/Controls/Control.md index 987cfdba..7751865b 100644 --- a/docs/Controls/Control.md +++ b/docs/Controls/Control.md @@ -182,6 +182,7 @@ | [IsFocused](#IsFocused) | 妫鏌ユ帶浠舵槸鍚﹀叿鏈夌劍鐐 | | [SetFocus](#SetFocus) | 璁╂帶浠惰幏鍙栫劍鐐 | | [SetNoFocus](#SetNoFocus) | 璁╂帶浠惰缃案杩滆幏鍙栦笉鍒扮劍鐐 | +| [GetControlFlags](#GetControlFlags) | 杩斿洖鎺т欢鐨勬爣璇嗭紝鐢ㄤ簬鍒ゆ柇鏄惁鍙互鍝嶅簲 TAB 鍒囨崲浜嬩欢 | | [IsMouseFocused](#IsMouseFocused) | 鍒ゆ柇褰撳墠榧犳爣鐒︾偣鏄惁鍦ㄦ帶浠朵笂 | | [SetMouseFocused](#SetMouseFocused) | 璁剧疆鏄惁灏嗛紶鏍囩劍鐐瑰埌鎺т欢涓 | | [IsActivatable](#IsActivatable) | 鍒ゆ柇鎺т欢褰撳墠鏄惁鏄縺娲荤姸鎬 | @@ -1447,6 +1448,17 @@ void SetNoFocus() - 鍙 鏁帮細鏃 - 杩斿洖鍊硷細鏃 +### GetControlFlags + +杩斿洖鎺т欢鐨勬爣璇嗭紝鐢ㄤ簬鍒ゆ柇鏄惁鍙互鍝嶅簲 TAB 鍒囨崲浜嬩欢 + +```cpp +virtual UINT GetControlFlags() const +``` + + - 鍙 鏁帮細鏃 + - 杩斿洖鍊硷細杩斿洖鎺т欢鐨勬爣璇嗙被鍨嬶紝`UIFLAG_DEFAULT` 涓洪粯璁ょ姸鎬佷笉鏀寔鐒︾偣鍒囨崲锛宍UIFLAG_TABSTOP` 涓烘敮鎸佺劍鐐瑰垏鎹 + ### IsMouseFocused 鍒ゆ柇褰撳墠榧犳爣鐒︾偣鏄惁鍦ㄦ帶浠朵笂 diff --git a/docs/Controls/Window.md b/docs/Controls/Window.md index 8d9d9ab9..4b21a334 100644 --- a/docs/Controls/Window.md +++ b/docs/Controls/Window.md @@ -33,7 +33,6 @@ | [Create](#Create) | 鍒涘缓绐楀彛 | | [Close](#Close) | 鍏抽棴绐楀彛 | | [ShowWindow](#ShowWindow) | 鏄剧ず鎴栭殣钘忕獥鍙 | -| [ShowModal](#ShowModal) | 鏄剧ず妯℃佸璇濇锛堜笉鎺ㄨ崘锛 | | [ShowModalFake](#ShowModalFake) | 鏄剧ず妯℃佸璇濇锛堟帹鑽愶級 | | [CenterWindow](#CenterWindow) | 灞呬腑绐楀彛锛屾敮鎸佹墿灞曞睆骞 | | [SetIcon](#SetIcon) | 璁剧疆绐楀彛鍥炬爣 | @@ -87,8 +86,6 @@ | [SetMinInfo](#SetMinInfo) | 璁剧疆绐楀彛鏈灏忚寖鍥 | | [SetMaxInfo](#SetMaxInfo) | 璁剧疆绐楀彛鏈澶ц寖鍥 | | [SetInitSize](#SetInitSize) | 璁剧疆绐楀彛鍒濆澶у皬 | -| [AddPreMessageFilter](#AddPreMessageFilter) | 娣诲姞涓涓秷鎭娲惧彂鍒扮獥鍙ｅ墠鐨勬秷鎭繃婊ゅ櫒 | -| [RemovePreMessageFilter](#RemovePreMessageFilter) | 绉婚櫎涓涓秷鎭娲惧彂鍒扮獥鍙ｅ墠鐨勬秷鎭繃婊ゅ櫒 | | [AddMessageFilter](#AddMessageFilter) | 娣诲姞涓涓秷鎭繃婊ゅ櫒锛屾鏃舵秷鎭凡缁忔淳鍙 | | [RemoveMessageFilter](#RemoveMessageFilter) | 绉婚櫎涓涓秷鎭繃婊ゅ櫒 | | [AddControlFromPointFinder](#AddControlFromPointFinder) | 鏌ユ壘鎺т欢鏃舵坊鍔犱竴涓牴鎹綅缃煡鎵炬帶浠剁殑閽╁瓙 | @@ -96,7 +93,6 @@ | [AddTranslateAccelerator](#AddTranslateAccelerator) | 娣诲姞涓涓 TranslateMessage 涔嬪墠鐨勬秷鎭繃婊ゅ櫒 | | [RemoveTranslateAccelerator](#RemoveTranslateAccelerator) | 绉婚櫎涓涓 TranslateMessage 涔嬪墠鐨勬秷鎭繃婊ゅ櫒 | | [TranslateAccelerator](#TranslateAccelerator) | 鎵ц TranslateMessage 闃舵鐨勮繃婊ゅ櫒 | -| [PreMessageHandler](#PreMessageHandler) | 鎵ц娲惧彂娑堝墠鐨勮繃婊ゅ櫒 | | [HandleMessage](#HandleMessage) | 绐楀彛娑堟伅鐨勬淳鍙戝嚱鏁 | | [DoHandlMessage](#DoHandlMessage) | 绐楀彛娑堟伅鐨勬墽琛屼綋锛岀敤浜庢墽琛屽悇绫昏繃婊ゅ櫒鍜屽鐞嗗悇绫绘秷鎭 | | [CallWindowProc](#CallWindowProc) | 瀵 CallWindowProc API 鐨勪竴灞傚皝瑁 | @@ -113,6 +109,7 @@ | [GetLastMousePos](#GetLastMousePos) | 鑾峰彇榧犳爣鏈鍚庣殑鍧愭爣 | | [SetHandlePointer](#SetHandlePointer) | 璁剧疆鏄惁澶勭悊瑙︽帶娑堟伅 | | [GetTooltipWindow](#GetTooltipWindow) | 鑾峰彇鎻愮ず淇℃伅鎵灞炵殑绐楀彛鍙ユ焺 | +| [SetNextTabControl](#SetNextTabControl) | 鍒囨崲鎺т欢鐒︾偣鍒颁笅涓涓紙鎴栦笂涓涓級鎺т欢 | | [GetRoot](#GetRoot) | 鑾峰彇绐楀彛鏈澶栧眰鐨勫鍣 | | [SetArrange](#SetArrange) | 璁剧疆鎺т欢鏄惁宸茬粡甯冨眬 | | [AddDelayedCleanup](#AddDelayedCleanup) | 寤惰繜閿姣佷竴涓帶浠 | @@ -269,17 +266,6 @@ virtual void ShowWindow(bool bShow = true, bool bTakeFocus = true) - `bTakeFocus` 鏄惁鑾峰緱鐒︾偣锛堟縺娲荤獥鍙ｏ級锛岄粯璁や负 true - 杩斿洖鍊硷細鏃 -### ShowModal - -鏄剧ず妯℃佸璇濇锛堜笉鎺ㄨ崘锛 - -```cpp -UINT ShowModal() -``` - - - 鍙 鏁帮細鏃 - - 杩斿洖鍊硷細鎺ユ敹鍒扮殑娑堟伅 - ### ShowModalFake 鏄剧ず妯℃佸璇濇锛堟帹鑽愶級 @@ -923,30 +909,6 @@ void SetInitSize(int cx, int cy, bool bContainShadow = false, bool bNeedDpiScale - `bNeedDpiScale` 涓 false 琛ㄧず涓嶆牴鎹 DPI 璋冩暣 - 杩斿洖鍊硷細鏃 -### AddPreMessageFilter - -娣诲姞涓涓秷鎭娲惧彂鍒扮獥鍙ｅ墠鐨勬秷鎭繃婊ゅ櫒 - -```cpp -bool AddPreMessageFilter(IUIMessageFilter* pFilter) -``` - - - 鍙 鏁帮細 - - `pFilter` 涓涓户鎵夸簡 IUIMessageFilter 鐨勫璞″疄渚嬶紝闇瑕佸疄鐜 MessageHandler 鏂规硶 - - 杩斿洖鍊硷細濮嬬粓杩斿洖 true - -### RemovePreMessageFilter - -绉婚櫎涓涓秷鎭娲惧彂鍒扮獥鍙ｅ墠鐨勬秷鎭繃婊ゅ櫒 - -```cpp -bool RemovePreMessageFilter(IUIMessageFilter* pFilter) -``` - - - 鍙 鏁帮細 - - `pFilter` 涓涓户鎵夸簡 IUIMessageFilter 鐨勫璞″疄渚 - - 杩斿洖鍊硷細杩斿洖 true 琛ㄧず绉婚櫎鎴愬姛锛屽惁鍒欏彲鑳借杩囨护鍣ㄤ笉瀛樺湪 - ### AddMessageFilter 娣诲姞涓涓秷鎭繃婊ゅ櫒锛屾鏃舵秷鎭凡缁忔淳鍙 @@ -1031,21 +993,6 @@ bool TranslateAccelerator(LPMSG pMsg) - `pMsg` 娑堟伅浣 - 杩斿洖鍊硷細杩斿洖 true 鎴愬姛澶勭悊娑堟伅锛屽惁鍒欒繑鍥 false -### PreMessageHandler - -鎵ц娲惧彂娑堝墠鐨勮繃婊ゅ櫒 - -```cpp -bool PreMessageHandler(UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT& lRes) -``` - - - 鍙 鏁帮細 - - `uMsg` 娑堟伅浣 - - `wParam` 娑堟伅闄勫姞鍙傛暟 - - `lParam` 娑堟伅闄勫姞鍙傛暟 - - `lRes` 澶勭悊缁撴灉 - - 杩斿洖鍊硷細杩斿洖 true 鍒欑户缁淳鍙戣娑堟伅锛屽惁鍒欎笉鍐嶆淳鍙戣娑堟伅 - ### HandleMessage 绐楀彛娑堟伅鐨勬淳鍙戝嚱鏁 @@ -1239,6 +1186,18 @@ HWND GetTooltipWindow() - 鍙 鏁帮細鏃 - 杩斿洖鍊硷細杩斿洖鎻愮ず淇℃伅鐨勭獥鍙ｅ彞鏌 +### SetNextTabControl + +鍒囨崲鎺т欢鐒︾偣鍒颁笅涓涓紙鎴栦笂涓涓級鎺т欢 + +```cpp +bool SetNextTabControl(bool bForward = true) +``` + + - 鍙 鏁帮細 + - `bForward` true 涓轰笂涓涓帶浠讹紝鍚﹀垯涓 false锛岄粯璁や负 true + - 杩斿洖鍊硷細濮嬬粓杩斿洖 true锛屾殏鏃犲弬鑰冩剰涔 + ### GetRoot 鑾峰彇绐楀彛鏈澶栧眰鐨勫鍣