diff --git a/wallitor-core/playerInstance.cpp b/wallitor-core/playerInstance.cpp index 42d8bc6..e0d31c5 100644 --- a/wallitor-core/playerInstance.cpp +++ b/wallitor-core/playerInstance.cpp @@ -59,13 +59,14 @@ BOOL playerInstance::showWindow(LPCWSTR lpParameter) { PROCESS_INFORMATION pi{ 0 }; if (CreateProcess(this->config.ffpath.c_str(), (LPWSTR)lpParameter, 0, 0, 0, CREATE_NO_WINDOW, 0, 0, &si, &pi)) { //Sleep(600);//等待视频播放器启动完成 - std::this_thread::sleep_for(std::chrono::milliseconds(300)); //HWND hProgman = FindWindow(L"Progman", 0);// 找到PI窗口 HWND hProgman = findWindowTimeOut(L"Progman",2000); + std::this_thread::sleep_for(std::chrono::milliseconds(300)); if (hProgman == nullptr) return FALSE; SendMessageTimeout(hProgman, 0x052c, 0, 0, 0, 300, 0);// 给它发特殊消息 //this->hFfplay = FindWindowW(L"SDL_app", 0);// 找到视频窗口 this->hFfplay = findWindowTimeOut(L"SDL_app", 2000); + std::this_thread::sleep_for(std::chrono::milliseconds(300)); if (this->hFfplay == nullptr) return FALSE; SetParent(hFfplay, hProgman);// 将视频窗口设苦为PM的子窗口 int systemWidth = GetSystemMetrics(0); diff --git a/wallitor-gui/src/App.vue b/wallitor-gui/src/App.vue index 3e0caff..17037b6 100644 --- a/wallitor-gui/src/App.vue +++ b/wallitor-gui/src/App.vue @@ -1,48 +1,28 @@ - diff --git a/wallitor-gui/src/assets/vw.png b/wallitor-gui/src/assets/vw.png new file mode 100644 index 0000000..15ca038 Binary files /dev/null and b/wallitor-gui/src/assets/vw.png differ diff --git a/wallitor-gui/src/components/ItemCard.vue b/wallitor-gui/src/components/ItemCard.vue new file mode 100644 index 0000000..d9b997f --- /dev/null +++ b/wallitor-gui/src/components/ItemCard.vue @@ -0,0 +1,26 @@ + + + \ No newline at end of file diff --git a/wallitor-gui/src/components/TitleBar.vue b/wallitor-gui/src/components/TitleBar.vue new file mode 100644 index 0000000..1bbebaf --- /dev/null +++ b/wallitor-gui/src/components/TitleBar.vue @@ -0,0 +1,161 @@ + + + + + \ No newline at end of file diff --git a/wallitor-gui/src/main.ts b/wallitor-gui/src/main.ts index 720fc88..2db62a0 100644 --- a/wallitor-gui/src/main.ts +++ b/wallitor-gui/src/main.ts @@ -3,6 +3,7 @@ import App from './App.vue' import router from './router' import "virtual:svg-icons-register"; import globalComponents from '@/components/install' +import "@/style/global.css" const app = createApp(App) diff --git a/wallitor-gui/src/style/global.css b/wallitor-gui/src/style/global.css new file mode 100644 index 0000000..15ea682 --- /dev/null +++ b/wallitor-gui/src/style/global.css @@ -0,0 +1,42 @@ +.colbox{ + display: flex; + flex-direction: row; +} + +.rowbox{ + display: flex; + flex-direction: column; +} + +html { + --text-shadow-color: #b3b3b3ae; + --bg-color-solid: #fcfcfc; + --bg-color-alter: #ffffff; + --bg-color: #ffffffae; + --text-color: #1c1c1c; + --bd-color: #bbbbbbce; + --login-button-bg: #9acdff; + --login-button-bd: #c8c8c8; + --login-button-hover: #7db7f0; + --branch-viewing-color: rgb(122, 212, 215); + --branch-viewing-hover-color: rgb(102, 177, 180); + --delete-box-left-border: #f56c6c; + --delete-box-bg: #f56c6c42; + --delete-box-title: #511f1f; + --delete-box-text: black; +} + +html.dark { + --text-shadow-color: #686868af; + --bg-color-solid: #191919; + --bg-color-alter: #2d2d2d; + --bg-color: #2a2a2ace; + --text-color: #c0c0c0; + --bd-color: #7f7f7f7c; + --titlebar-height: 40px; + --shadow-edge-glow: inset 1px 1px 1px -.5px rgba(255, 255, 255, .12), inset -1px -1px 1px -.5px rgba(255, 255, 255, .04), inset 0 0 4px rgba(255, 255, 255, .06); + --shadow: 0 10px 15px -3px rgb(0 0 0 / .2), 0 4px 6px -4px rgb(0 0 0 / .16); + --bg-color-alpha: hsl(230 12% 14% / .68); + --bg-hover-fill: rgb(131 131 145 / 24%); + --bg-hover-fill-close: rgba(211, 86, 86, 0.579); +} \ No newline at end of file