diff --git a/Flint/Flint.vcxproj b/Flint/Flint.vcxproj index e004bc0..e1b3360 100644 --- a/Flint/Flint.vcxproj +++ b/Flint/Flint.vcxproj @@ -92,7 +92,7 @@ true _DEBUG;_WINDOWS;%(PreprocessorDefinitions) true - stdcpp20 + stdcpplatest stdc17 @@ -106,7 +106,7 @@ true _DEBUG;_WINDOWS;%(PreprocessorDefinitions) true - stdcpp20 + stdcpplatest stdc17 @@ -123,7 +123,7 @@ true NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true - stdcpp20 + stdcpplatest stdc17 @@ -141,7 +141,7 @@ true NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true - stdcpp20 + stdcpplatest stdc17 diff --git a/NVIDIA/NVIDIA.vcxproj b/NVIDIA/NVIDIA.vcxproj index 123fedc..03539ab 100644 --- a/NVIDIA/NVIDIA.vcxproj +++ b/NVIDIA/NVIDIA.vcxproj @@ -89,7 +89,7 @@ true Use pch.h - stdcpp20 + stdcpplatest stdc17 @@ -105,7 +105,7 @@ true Use pch.h - stdcpp20 + stdcpplatest stdc17 @@ -123,7 +123,7 @@ true Use pch.h - stdcpp20 + stdcpplatest stdc17 @@ -143,7 +143,7 @@ true Use pch.h - stdcpp20 + stdcpplatest stdc17 diff --git a/NVIDIA/sl_consts.h b/NVIDIA/sl_consts.h index 64192d1..6babc92 100644 --- a/NVIDIA/sl_consts.h +++ b/NVIDIA/sl_consts.h @@ -147,6 +147,10 @@ { return !operator==(rhs); } + inline bool isSameRes(const Extent& rhs) const + { + return width == rhs.width && height == rhs.height; + } }; //! For cases when value has to be provided and we don't have good default diff --git a/NVIDIA/sl_version.h b/NVIDIA/sl_version.h index e96c66a..08972cb 100644 --- a/NVIDIA/sl_version.h +++ b/NVIDIA/sl_version.h @@ -23,7 +23,7 @@ #define SL_VERSION_MAJOR 2 #define SL_VERSION_MINOR 4 -#define SL_VERSION_PATCH 10 +#define SL_VERSION_PATCH 11 #include diff --git a/Protobuf/Event.cs b/Protobuf/Event.cs index a6b1f3e..a0471b1 100644 --- a/Protobuf/Event.cs +++ b/Protobuf/Event.cs @@ -22,7 +22,7 @@ static EventReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "CgtFdmVudC5wcm90byKaMQoFRXZlbnQSDgoGbWlsbGlzGAEgASgDEhAKCGF2", + "CgtFdmVudC5wcm90byKrMQoFRXZlbnQSDgoGbWlsbGlzGAEgASgDEhAKCGF2", "YXRhcklEGAIgASgJEh8KB2V2ZW50SUQYAyABKA4yDi5FdmVudC5FdmVudElE", "EgwKBHRleHQYBCABKAkSDAoEZGF0YRgFIAMoDBIxCg9xd2lsaWdodENhbGxO", "ZXQYBiABKAsyFi5FdmVudC5Rd2lsaWdodENhbGxOZXRIABIxCg90d2lsaWdo", @@ -123,7 +123,7 @@ "EhMKC2hpZ2hlc3RXYWl0GAYgASgBGlsKEFR3aWxpZ2h0UG9zdEl0ZW0SEQoJ", "aGFuZGxlcklEGAEgASgJEhIKCnBvc3RlZEl0ZW0YAiABKAUSEgoKYXZhdGFy", "TmFtZRgDIAEoCRIMCgR3YWl0GAQgASgBIjUKD0F2YXRhck5ldFN0YXR1cxIL", - "CgdEZWZhdWx0EAASCQoFQ2xlYXIQARIKCgZGYWlsZWQQAiK4DQoHRXZlbnRJ", + "CgdEZWZhdWx0EAASCQoFQ2xlYXIQARIKCgZGYWlsZWQQAiLJDQoHRXZlbnRJ", "RBIKCgZMT0dfSU4QABIOCgpOT1RfTE9HX0lOEAESCgoGTk9USUZZEAISDQoJ", "U0lURV9ZRUxMEAMSDwoLQ0FMTF9CVU5ETEUQBBISCg5TQVZFX0FTX0JVTkRM", "RRAFEhEKDVNBVklOR19CVU5ETEUQBhIPCgtXSVBFX0JVTkRMRRAHEg4KClNF", @@ -162,7 +162,7 @@ "VF9BVkFUQVJfR1JPVVAQUhINCglQT1NUX0lURU0QUxIWChJTRVRfVkFMSURf", "TkVUX01PREUQVBIeChpTRVRfQUxMT1dFRF9QT1NUQUJMRV9JVEVNUxBVEhoK", "FlNFVF9QT1NUQUJMRV9JVEVNX0JBTkQQVhIUChBBQklMSVRZX0NMQVNTX1VQ", - "EFdCCgoIZmFzdFRleHRiBnByb3RvMw==")); + "EFcSDwoLTk9USUZZX1BBU1MQWEIKCghmYXN0VGV4dGIGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { @@ -1552,6 +1552,7 @@ [pbr::OriginalName("SET_ALLOWED_POSTABLE_ITEMS")] SetAllowedPostableItems = 85, [pbr::OriginalName("SET_POSTABLE_ITEM_BAND")] SetPostableItemBand = 86, [pbr::OriginalName("ABILITY_CLASS_UP")] AbilityClassUp = 87, + [pbr::OriginalName("NOTIFY_PASS")] NotifyPass = 88, } [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")] diff --git a/Protobuf/Event.proto b/Protobuf/Event.proto index 0910f2b..3f2598e 100644 --- a/Protobuf/Event.proto +++ b/Protobuf/Event.proto @@ -322,5 +322,6 @@ SET_ALLOWED_POSTABLE_ITEMS = 85; SET_POSTABLE_ITEM_BAND = 86; ABILITY_CLASS_UP = 87; + NOTIFY_PASS = 88; } } \ No newline at end of file diff --git a/Qwilight/Assets/AMD64/CChromaEditorLibrary64.dll b/Qwilight/Assets/AMD64/CChromaEditorLibrary64.dll deleted file mode 100644 index ff5ce36..0000000 --- a/Qwilight/Assets/AMD64/CChromaEditorLibrary64.dll +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7523335cf3be105f73d0d60703af0bfd8bd5db1989218c682baf66346cd51634 -size 440720 diff --git a/Qwilight/Assets/AMD64/LogitechLedEnginesWrapper.dll b/Qwilight/Assets/AMD64/LogitechLedEnginesWrapper.dll deleted file mode 100644 index 815b40c..0000000 --- a/Qwilight/Assets/AMD64/LogitechLedEnginesWrapper.dll +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:46a0773e5ae6ef5b24557f3051e18a62527c7b2c133360dfb21522cbfe9cbdd1 -size 20104 diff --git a/Qwilight/Assets/AMD64/avcodec-61.dll b/Qwilight/Assets/AMD64/avcodec-61.dll index 281358e..ed2b2eb 100644 --- a/Qwilight/Assets/AMD64/avcodec-61.dll +++ b/Qwilight/Assets/AMD64/avcodec-61.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ce06365ca1e27c894023e2493f8300d06dac6d09c29077e3382f8f03730e09c1 -size 83920384 +oid sha256:8bb548bdcc93e5970acdefd2a082dd6afd6204a5fa07886ce681efa25171fbbc +size 83859968 diff --git a/Qwilight/Assets/AMD64/avdevice-61.dll b/Qwilight/Assets/AMD64/avdevice-61.dll index dad66b7..b8bbd66 100644 --- a/Qwilight/Assets/AMD64/avdevice-61.dll +++ b/Qwilight/Assets/AMD64/avdevice-61.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2002fd0bf8dedc82400a31b97c7721ccf4992cf67ab07c06bd800dbd87f87a56 -size 4451840 +oid sha256:b35c7aa725d89740e00996ea97edee7e5b103188eec3c3ff8ab98d93de170a23 +size 4454912 diff --git a/Qwilight/Assets/AMD64/avfilter-10.dll b/Qwilight/Assets/AMD64/avfilter-10.dll index 7eba29e..031c129 100644 --- a/Qwilight/Assets/AMD64/avfilter-10.dll +++ b/Qwilight/Assets/AMD64/avfilter-10.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:93c9e8cbb74353a24415f4859b01591e963905feba534e72d48ad3e18ba3a5d1 -size 40916992 +oid sha256:9303b2f9af25eecc31ecc1981667c586cbd70a14fe06d66ddb91f0c1a78696c2 +size 41396736 diff --git a/Qwilight/Assets/AMD64/avformat-61.dll b/Qwilight/Assets/AMD64/avformat-61.dll index 620f386..0b9f097 100644 --- a/Qwilight/Assets/AMD64/avformat-61.dll +++ b/Qwilight/Assets/AMD64/avformat-61.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b1ba36879fd29f31184472f7309dc2778bb9c208b0c4761e3d7fc0ee2e514781 -size 18280960 +oid sha256:8c3cb6776cee21b6a02be8be91b47cf8ee48a4303b4163bfde6caadbe5c948f1 +size 18293248 diff --git a/Qwilight/Assets/AMD64/avutil-59.dll b/Qwilight/Assets/AMD64/avutil-59.dll index 2484bc8..1cd0edf 100644 --- a/Qwilight/Assets/AMD64/avutil-59.dll +++ b/Qwilight/Assets/AMD64/avutil-59.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:41f85009ca115ab4da298558475fff346cd925080c8cc471f7fe008d57d1dac9 -size 2717696 +oid sha256:002cd1845b3fb67055d3e352c3cfee705b57e28a5a9c3f05f2b757ace926d5e0 +size 2743296 diff --git a/Qwilight/Assets/AMD64/ffmpeg.exe b/Qwilight/Assets/AMD64/ffmpeg.exe index e3b91e7..1a1e192 100644 --- a/Qwilight/Assets/AMD64/ffmpeg.exe +++ b/Qwilight/Assets/AMD64/ffmpeg.exe @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:18c842fb2b88d36c882a3b852849b8ddd821a1816e863c69501052c7b2e4e052 +oid sha256:d5a7cfc3237a6e332b5883417328325ca4675d4151c7d21030c3a66e283c0c14 size 437248 diff --git a/Qwilight/Assets/AMD64/ffprobe.exe b/Qwilight/Assets/AMD64/ffprobe.exe index 6e3b3e4..3780498 100644 --- a/Qwilight/Assets/AMD64/ffprobe.exe +++ b/Qwilight/Assets/AMD64/ffprobe.exe @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:728f787d1dd9cf9280d6c64fa560617a3a6c58b810cf8454053fff9399e83961 +oid sha256:f8893b751138119cf8869b8d1abb32c8729c1c7a84b4b297c7fd9e413b0f71e9 size 210432 diff --git a/Qwilight/Assets/AMD64/postproc-58.dll b/Qwilight/Assets/AMD64/postproc-58.dll index 2c15adf..a8e93b0 100644 --- a/Qwilight/Assets/AMD64/postproc-58.dll +++ b/Qwilight/Assets/AMD64/postproc-58.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9458f60fbcd5ca932367a1ad608b7861fbb6aa3e3d526bffc044207338071b89 +oid sha256:bf0d49c3b342a6e5a801a8a13777e9bcf425a13ac9693945c7984c18f8c07d93 size 88576 diff --git a/Qwilight/Assets/AMD64/sl.common.dll b/Qwilight/Assets/AMD64/sl.common.dll index d665203..da969a7 100644 --- a/Qwilight/Assets/AMD64/sl.common.dll +++ b/Qwilight/Assets/AMD64/sl.common.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:97c604eef5512a5e5f905c8018fd0eacb85677d41fafe2bc5374e04fdb2be516 -size 676312 +oid sha256:83163449ac855a229d4df9e690ab1ed548926a7edecb0426371b5c39db2b1e97 +size 627176 diff --git a/Qwilight/Assets/AMD64/sl.interposer.dll b/Qwilight/Assets/AMD64/sl.interposer.dll index 1dd1099..a00fb57 100644 --- a/Qwilight/Assets/AMD64/sl.interposer.dll +++ b/Qwilight/Assets/AMD64/sl.interposer.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:57f106b725568a2ef84804a31ea4b8270bdfbf26622bb0140f7d0b3ce1061994 -size 537056 +oid sha256:4fbfc02d701c42a1ccdb32c9739b974d4d13be2374b5723df76df24cb9a4086d +size 484840 diff --git a/Qwilight/Assets/AMD64/sl.pcl.dll b/Qwilight/Assets/AMD64/sl.pcl.dll index 11af077..28f994e 100644 --- a/Qwilight/Assets/AMD64/sl.pcl.dll +++ b/Qwilight/Assets/AMD64/sl.pcl.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b457c4fc708f6c37c7c7224d898f5c74d6751080c546a14d8b0b683d1bd2d4c -size 167896 +oid sha256:932a5bfd10025cf58c8a0c74d279a7d8b1ea1de9828ed33b790d4cb9341f1247 +size 165864 diff --git a/Qwilight/Assets/AMD64/sl.reflex.dll b/Qwilight/Assets/AMD64/sl.reflex.dll index 5010821..06daa53 100644 --- a/Qwilight/Assets/AMD64/sl.reflex.dll +++ b/Qwilight/Assets/AMD64/sl.reflex.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7c64edc582b9fd4da08fec8ce9ecac3d6a564c85c4f1fc7850169b4f9307eca8 -size 177120 +oid sha256:85cb5a255e0cfcf476c906cd582f80f91b934462c9fb1752e454401c387bca81 +size 173032 diff --git a/Qwilight/Assets/AMD64/swresample-5.dll b/Qwilight/Assets/AMD64/swresample-5.dll index 0963475..e899e2d 100644 --- a/Qwilight/Assets/AMD64/swresample-5.dll +++ b/Qwilight/Assets/AMD64/swresample-5.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7f191b6e26d83eafc3d8d5e4c7cbf13290b8bf3a710617a9901fcf3642c59eac +oid sha256:75011af0734fa7d116c58ef196d4251531624cf4aecbdd960522f2d2e67d719d size 435200 diff --git a/Qwilight/Assets/AMD64/swscale-8.dll b/Qwilight/Assets/AMD64/swscale-8.dll index 494ac49..c79375b 100644 --- a/Qwilight/Assets/AMD64/swscale-8.dll +++ b/Qwilight/Assets/AMD64/swscale-8.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5c04128bc81a7174380b52bdddb09e047c563c6e611f5a3d9bbd4430946eaf03 -size 646144 +oid sha256:2e979e6b56fa292405b6c1c89c6bcbaaa01f076f7f5eaacbe1390320272ac6c6 +size 645632 diff --git a/Qwilight/Assets/AMD64/wooting-rgb-sdk64.dll b/Qwilight/Assets/AMD64/wooting-rgb-sdk64.dll index 90d233f..d342e95 100644 --- a/Qwilight/Assets/AMD64/wooting-rgb-sdk64.dll +++ b/Qwilight/Assets/AMD64/wooting-rgb-sdk64.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c2bb7b27f442dd1f542ea3198fed5fac07f93954ae3686f0169ca3251c800011 -size 45832 +oid sha256:7876bf1c6ad67f24dae394591b3f3e805318ecdb8084cfc7bea907e5fea2fea6 +size 50176 diff --git a/Qwilight/Assets/Language.json b/Qwilight/Assets/Language.json index cf58345..dbc0b6d 100644 --- a/Qwilight/Assets/Language.json +++ b/Qwilight/Assets/Language.json @@ -2767,6 +2767,10 @@ "ko-KR": "건너뛰기", "en-US": "Skip it" }, + "PassNotify": { + "ko-KR": "{0}의 기록을 {1}님이 추월함", + "en-US": "{1} has overtaken the record of {0}" + }, "PauseAssist": { "ko-KR": "미리듣기를 일시 정지합니다.", "en-US": "Pause the preview" diff --git a/Qwilight/JSON.cs b/Qwilight/JSON.cs index ad0889c..0384833 100644 --- a/Qwilight/JSON.cs +++ b/Qwilight/JSON.cs @@ -242,14 +242,24 @@ public int avatarCount; } - public class TwilightNotify + public struct TwilightNotify { public string text; public bool isUrgent; public NotifySystem.NotifyVariety v; } - public class TwilightLevelUp + public struct TwilightNotifyPass + { + public string title; + public string artist; + public string genre; + public string levelText; + public string avatarName; + public string noteID; + } + + public struct TwilightLevelUp { public int from; public int to; diff --git a/Qwilight/NativeMethods.txt b/Qwilight/NativeMethods.txt index c2c83d4..83788b9 100644 --- a/Qwilight/NativeMethods.txt +++ b/Qwilight/NativeMethods.txt @@ -12,13 +12,13 @@ FreeConsole GetAsyncKeyState GetConsoleWindow -GetCurrentConsoleFontEx GetDpiForWindow GetMessage GetRawInputData GetSystemMenu GetWindowInfo IDirect3DDxgiInterfaceAccess +IGraphicsCaptureItemInterop MENU_ITEM_FLAGS MessageBox PostMessage @@ -30,6 +30,7 @@ SetWindowLongPtr SetWindowPos SetWindowText +timeBeginPeriod TranslateMessage WM_ACTIVATE WM_CLOSE @@ -38,6 +39,4 @@ WM_INPUT WM_KEYDOWN WM_MOVE -WM_SIZE -timeBeginPeriod -IGraphicsCaptureItemInterop \ No newline at end of file +WM_SIZE \ No newline at end of file diff --git a/Qwilight/Qwilight.csproj b/Qwilight/Qwilight.csproj index e3dcd1e..56fb29d 100644 --- a/Qwilight/Qwilight.csproj +++ b/Qwilight/Qwilight.csproj @@ -10,7 +10,7 @@ Qwilight.ico Taehui 불로그 - 1.16.37 + 1.16.38 true enable false diff --git a/Qwilight/System/LanguageSystem/LanguageSystem.g.cs b/Qwilight/System/LanguageSystem/LanguageSystem.g.cs index cc805b7..f7ccd0e 100644 --- a/Qwilight/System/LanguageSystem/LanguageSystem.g.cs +++ b/Qwilight/System/LanguageSystem/LanguageSystem.g.cs @@ -694,6 +694,7 @@ public string P1SymmetricCopyNotesText { get; set; } public string P2SymmetricCopyNotesText { get; set; } public string PassContents { get; set; } + public string PassNotify { get; set; } public string PauseAssist { get; set; } public string PlatformAutoComputing { get; set; } public string PlatformCommentComputing { get; set; } diff --git a/Qwilight/System/TwilightSystem.cs b/Qwilight/System/TwilightSystem.cs index 6d56406..b8e0263 100644 --- a/Qwilight/System/TwilightSystem.cs +++ b/Qwilight/System/TwilightSystem.cs @@ -328,6 +328,10 @@ var twilightNotify = Utility.GetJSON(eventItemText); NotifySystem.Instance.Notify(twilightNotify.v, NotifySystem.NotifyConfigure.Default, twilightNotify.text, twilightNotify.isUrgent); break; + case Event.Types.EventID.NotifyPass: + var twilightNotifyPass = Utility.GetJSON(eventItemText); + NotifySystem.Instance.Notify(NotifySystem.NotifyVariety.Info, NotifySystem.NotifyConfigure.Default, string.Format(LanguageSystem.Instance.PassNotify, Utility.GetPlatformText(twilightNotifyPass.title, twilightNotifyPass.artist, Utility.GetGenreText(twilightNotifyPass.genre), twilightNotifyPass.levelText), twilightNotifyPass.avatarName), false, "Notify Pass", () => mainViewModel.MoveEntryItemsView(twilightNotifyPass.noteID)); + break; case Event.Types.EventID.LevelUp: var twilightLevelUp = Utility.GetJSON(eventItemText); NotifySystem.Instance.Notify(NotifySystem.NotifyVariety.OK, NotifySystem.NotifyConfigure.Default, $"LV. {twilightLevelUp.from} → LV. {twilightLevelUp.to}", true, "Level Up"); diff --git a/Qwilight/UIComponent/EntryItem.cs b/Qwilight/UIComponent/EntryItem.cs index 0d1a60e..c6508bc 100644 --- a/Qwilight/UIComponent/EntryItem.cs +++ b/Qwilight/UIComponent/EntryItem.cs @@ -31,7 +31,7 @@ public BaseNoteFile NoteFile => NoteFiles[NotePosition]; - public string PositionText => WellNoteFiles.Count >= 2 ? $"{NotePosition - NoteFiles.SkipLast(NoteFiles.Length - NotePosition).Count(noteFile => !WellNoteFiles.Contains(noteFile)) + 1}／{WellNoteFiles.Count}" : string.Empty; + public string PositionText => WellNoteFiles.Count >= 2 ? $"{(WellNoteFiles.Contains(NoteFile) ? NotePosition - NoteFiles.SkipLast(NoteFiles.Length - NotePosition).Count(noteFile => !WellNoteFiles.Contains(noteFile)) + 1 : "?")}／{WellNoteFiles.Count}" : string.Empty; public List WellNoteFiles { get; set; } @@ -39,12 +39,17 @@ public int NotePosition { get; set; } - public void ModifyNotePosition(int notePosition) + public bool ModifyNotePosition(int notePosition) { if (NotePosition != notePosition) { NotePosition = notePosition; WasNotePositionModified = true; + return true; + } + else + { + return false; } } @@ -127,8 +132,7 @@ { if (WellNoteFiles.Contains(NoteFiles[notePosition])) { - ModifyNotePosition(notePosition); - return true; + return ModifyNotePosition(notePosition); } else { @@ -155,8 +159,7 @@ { if (WellNoteFiles.Contains(NoteFiles[notePosition])) { - ModifyNotePosition(notePosition); - return true; + return ModifyNotePosition(notePosition); } else { diff --git a/Qwilight/ViewModel/AvatarViewModel.cs b/Qwilight/ViewModel/AvatarViewModel.cs index 1ea16fe..736d6a9 100644 --- a/Qwilight/ViewModel/AvatarViewModel.cs +++ b/Qwilight/ViewModel/AvatarViewModel.cs @@ -30,13 +30,10 @@ public new void OnLevyNoteFile(MouseButtonEventArgs e) { var mainViewModel = ViewModels.Instance.MainValue; - if (mainViewModel.NoteID512s.TryGetValue(GetNoteID512(), out var noteFile)) + var noteFile = mainViewModel.MoveEntryItemsView(GetNoteID512()); + if (noteFile != null && e.ClickCount >= 2) { - mainViewModel.EntryItemValue = noteFile.EntryItem; - if (e.ClickCount >= 2) - { - mainViewModel.HandleLevyNoteFile(noteFile, noteFile.EntryItem, _avatarID); - } + mainViewModel.HandleLevyNoteFile(noteFile, noteFile.EntryItem, _avatarID); } } diff --git a/Qwilight/ViewModel/MainViewModel.cs b/Qwilight/ViewModel/MainViewModel.cs index 6117571..af8e2dd 100644 --- a/Qwilight/ViewModel/MainViewModel.cs +++ b/Qwilight/ViewModel/MainViewModel.cs @@ -1024,7 +1024,7 @@ public void SetLastDefaultEntryItem(DefaultEntryItem defaultEntryItem) { - if (Configure.Instance.LastDefaultEntryItem == null ^ defaultEntryItem == null) + if (Configure.Instance.LastDefaultEntryItem != defaultEntryItem) { Configure.Instance.LastDefaultEntryItem = defaultEntryItem; LoadDefaultEntryItem(false); @@ -3199,6 +3199,27 @@ Target = EntryItemValue }); + public BaseNoteFile MoveEntryItemsView(string noteID) + { + if (NoteID512s.TryGetValue(noteID, out var noteFile)) + { + SetLastDefaultEntryItem(noteFile.DefaultEntryItem); + var entryItem = noteFile.EntryItem; + EntryItemValue = entryItem; + if (entryItem.ModifyNotePosition(Array.IndexOf(entryItem.NoteFiles, noteFile))) + { + NotifyNoteFile(); + BaseUI.Instance.HandleEvent(BaseUI.EventItem.ModifyNoteFile); + DB.Instance.SetNotePosition(entryItem); + } + return noteFile; + } + else + { + return null; + } + } + public void PointEntryItemsView() => StrongReferenceMessenger.Default.Send(); public void SetWPFViewVisibility() diff --git a/Qwilight/ViewModel/NoteFileViewModel.cs b/Qwilight/ViewModel/NoteFileViewModel.cs index 8e50176..f320c9e 100644 --- a/Qwilight/ViewModel/NoteFileViewModel.cs +++ b/Qwilight/ViewModel/NoteFileViewModel.cs @@ -60,9 +60,12 @@ if (value != null && SetProperty(ref _noteFile, value, nameof(NoteFile))) { OnPropertyChanged(nameof(IsNoteFileNotLogical)); - var mainViewModel = ViewModels.Instance.MainValue; - mainViewModel.EntryItemValue.ModifyNotePosition(Array.IndexOf(_rawNoteFileCollection, value)); - mainViewModel.NotifyNoteFile(); + if (EntryItemValue.ModifyNotePosition(Array.IndexOf(_rawNoteFileCollection, value))) + { + ViewModels.Instance.MainValue.NotifyNoteFile(); + BaseUI.Instance.HandleEvent(BaseUI.EventItem.ModifyNoteFile); + DB.Instance.SetNotePosition(EntryItemValue); + } } } } diff --git a/Xwindow/Xwindow.vcxproj b/Xwindow/Xwindow.vcxproj index af63477..71adcff 100644 --- a/Xwindow/Xwindow.vcxproj +++ b/Xwindow/Xwindow.vcxproj @@ -92,7 +92,7 @@ true _DEBUG;_WINDOWS;%(PreprocessorDefinitions) true - stdcpp20 + stdcpplatest stdc17 @@ -106,7 +106,7 @@ true _DEBUG;_WINDOWS;%(PreprocessorDefinitions) true - stdcpp20 + stdcpplatest stdc17 @@ -122,7 +122,7 @@ true NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true - stdcpp20 + stdcpplatest stdc17 @@ -140,7 +140,7 @@ true NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true - stdcpp20 + stdcpplatest stdc17