AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-14 01:55:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix on windows, if you maximise the window then press F11, the window completely disappears instead of going fullscreen

Browse Source
This commit is contained in:
UnknownShadow200 2020-01-03 20:06:55 +11:00
parent b7099de880
commit bf13d69f9a
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/LWeb.c
View File

@ -182,7 +182,7 @@ void Json_Parse(struct JsonContext* ctx) {
static void Json_Handle(cc_uint8* data, cc_uint32 len, static void Json_Handle(cc_uint8* data, cc_uint32 len,
JsonOnValue onVal, JsonOnNew newArr, JsonOnNew newObj) { JsonOnValue onVal, JsonOnNew newArr, JsonOnNew newObj) {
struct JsonContext ctx; struct JsonContext ctx;
/* NOTE: classicube.net uses \u JSON for non ASCII, no need to UTF8 convert characters */ /* NOTE: classicube.net uses \u JSON for non ASCII, no need to UTF8 convert characters here */
String str = String_Init((char*)data, len, len); String str = String_Init((char*)data, len, len);
Json_Init(&ctx, &str); Json_Init(&ctx, &str);
@ -263,7 +263,7 @@ void GetTokenTask_Run(void) {
*--------------------------------------------------------SignInTask-------------------------------------------------------* *--------------------------------------------------------SignInTask-------------------------------------------------------*
*#########################################################################################################################*/ *#########################################################################################################################*/
struct SignInTaskData SignInTask; struct SignInTaskData SignInTask;
char userBuffer[STRING_SIZE]; static char userBuffer[STRING_SIZE];
static void SignInTask_LogError(const String* str) { static void SignInTask_LogError(const String* str) {
if (String_CaselessEqualsConst(str, "username") || String_CaselessEqualsConst(str, "password")) { if (String_CaselessEqualsConst(str, "username") || String_CaselessEqualsConst(str, "password")) {
@ -295,20 +295,20 @@ static void SignInTask_Append(String* dst, const char* key, const String* value)
void SignInTask_Run(const String* user, const String* pass) { void SignInTask_Run(const String* user, const String* pass) {
static const String id = String_FromConst("CC post login"); static const String id = String_FromConst("CC post login");
static const String url = String_FromConst("https://www.classicube.net/api/login"); static const String url = String_FromConst("https://www.classicube.net/api/login");
String tmp; char tmpBuffer[384]; String args; char argsBuffer[384];
if (SignInTask.Base.working) return; if (SignInTask.Base.working) return;
LWebTask_Reset(&SignInTask.Base); LWebTask_Reset(&SignInTask.Base);
String_InitArray(SignInTask.username, userBuffer); String_InitArray(SignInTask.username, userBuffer);
SignInTask.error = NULL; SignInTask.error = NULL;
String_InitArray(tmp, tmpBuffer); String_InitArray(args, argsBuffer);
SignInTask_Append(&tmp, "username=", user); SignInTask_Append(&args, "username=", user);
SignInTask_Append(&tmp, "&password=", pass); SignInTask_Append(&args, "&password=", pass);
SignInTask_Append(&tmp, "&token=", &GetTokenTask.token); SignInTask_Append(&args, "&token=", &GetTokenTask.token);
SignInTask.Base.identifier = id; SignInTask.Base.identifier = id;
Http_AsyncPostData(&url, false, &id, tmp.buffer, tmp.length, &ccCookies); Http_AsyncPostData(&url, false, &id, args.buffer, args.length, &ccCookies);
SignInTask.Base.Handle = SignInTask_Handle; SignInTask.Base.Handle = SignInTask_Handle;
} }

6
src/Window.c
View File

@ -492,10 +492,10 @@ void Window_Show(void) {
} }
int Window_GetWindowState(void) { int Window_GetWindowState(void) {
DWORD style = GetWindowLong(win_handle, GWL_STYLE); DWORD s = GetWindowLong(win_handle, GWL_STYLE);
if (style & WS_MINIMIZE) return WINDOW_STATE_MINIMISED; if ((s & WS_MINIMIZE)) return WINDOW_STATE_MINIMISED;
if (style & (WS_MAXIMIZE | WS_POPUP)) return WINDOW_STATE_FULLSCREEN; if ((s & WS_MAXIMIZE) && (s & WS_POPUP)) return WINDOW_STATE_FULLSCREEN;
return WINDOW_STATE_NORMAL; return WINDOW_STATE_NORMAL;
} }