Skip to content

Commit

Permalink
ok
Browse files Browse the repository at this point in the history
  • Loading branch information
FireMario211 committed Sep 4, 2024
1 parent 51c6cae commit 6077219
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
3 changes: 3 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# v1.0.5
- Fixed issue with pausing the editor causing misalignment
- Fixed the "token expiration" popup
# v1.0.4
- Showcased whether or not your object is pending
- Allowed sending a report reason (required)
Expand Down
4 changes: 2 additions & 2 deletions mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"id": "firee.object-workshop",
"name": "Object Workshop",
"version": "v1.0.4",
"version": "v1.0.5",
"developer": "Firee",
"description": "Download, upload, or find custom objects made by other creators!",
"resources": {
Expand Down Expand Up @@ -59,7 +59,7 @@
},
{
"id": "alphalaneous.editortab_api",
"version": ">=v1.0.0-alpha.21",
"version": ">=v1.0.0-beta.2",
"importance": "required"
}
]
Expand Down
11 changes: 6 additions & 5 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ void CustomObjects::onWorkshop(CCObject*) {
}
case AuthMethod::Custom: {
FLAlertLayer::create("Error", "Either the token you set is <cy>expired</c>, or you <cy>entered the token incorrectly!</c>", "OK")->show();
break;
}
case AuthMethod::GDAuth: {
authentication::AuthenticationManager::get()->getAuthenticationToken([](std::string token) {
Expand Down Expand Up @@ -182,13 +183,13 @@ bool CustomObjects::init(LevelEditorLayer* editorLayer) {
req.bodyJSON(myjson);
m_fields->m_listener.setFilter(req.post(fmt::format("{}/user/@me", HOST_URL)));
}
m_fields->menu->setPosition({-2, -112});
//m_fields->menu->setPosition({285, 45});
return EditorTabUtils::createEditButtonBar(arr, ui);
//return m_fields->menu;
//m_fields->menu->setPosition({-2, -112});
m_fields->menu->setPosition({285, 45});
//return EditorTabUtils::createEditButtonBar(arr, ui);
return m_fields->menu;
}, [this](EditorUI* ui, bool state, CCNode*) { //toggled the tab (activates on every tab click)
if (m_fields->menu != nullptr) {
m_fields->menu->setPosition({-2, -112});
//m_fields->menu->setPosition({-2, -112});
}
});

Expand Down

0 comments on commit 6077219

Please sign in to comment.