Links (#615)
* add URL support to Label element and XML parsing * refactor Label URL handling to use getter method in setURL * implement URL opening confirmation dialog and platform-specific URL handling * fix: fixed build errors * remove: delete test link label from worlds.xml * refactor: remove URL handling from Label class and XML parsing * refactor: clean up Label class by removing unnecessary whitespace and improving code readability * refactor: remove unused URL member from Label class * refactor: remove unused URL attribute from XML UI documentation and related code * refactor: improve code readability by adding whitespace and formatting adjustments in Label class * refactor: improve whitespace consistency in Label class and add URL opening functionality in libcore
This commit is contained in:
@@ -103,9 +103,14 @@ void guiutil::confirm(
|
||||
|
||||
panel->setGravity(Gravity::center_center);
|
||||
container->add(panel);
|
||||
|
||||
panel->setColor(glm::vec4(0.0f, 0.0f, 0.0f, 0.5f));
|
||||
panel->add(std::make_shared<Label>(gui, text));
|
||||
|
||||
auto label = std::make_shared<Label>(gui, text);
|
||||
label->setSize(glm::vec2(600, 50));
|
||||
label->setMultiline(true);
|
||||
label->setTextWrapping(true);
|
||||
|
||||
panel->add(label);
|
||||
auto subpanel = std::make_shared<Panel>(gui, glm::vec2(600, 53));
|
||||
subpanel->setColor(glm::vec4(0));
|
||||
|
||||
|
||||
@@ -20,6 +20,11 @@
|
||||
#include "util/platform.hpp"
|
||||
#include "world/Level.hpp"
|
||||
#include "world/generator/WorldGenerator.hpp"
|
||||
#include "util/platform.hpp"
|
||||
#include "frontend/locale.hpp"
|
||||
#include "graphics/ui/gui_util.hpp"
|
||||
#include "graphics/ui/GUI.hpp"
|
||||
#include "graphics/ui/elements/Menu.hpp"
|
||||
|
||||
using namespace scripting;
|
||||
|
||||
@@ -229,6 +234,24 @@ static int l_open_folder(lua::State* L) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int l_open_url(lua::State* L) {
|
||||
auto url = lua::require_string(L, 1);
|
||||
|
||||
std::wstring msg = langs::get(L"Are you sure you want to open the link:") +
|
||||
L"\n" + util::str2wstr_utf8(url) +
|
||||
std::wstring(L"?");
|
||||
|
||||
auto menu = engine->getGUI().getMenu();
|
||||
|
||||
guiutil::confirm(*engine, msg, [url, menu]() {
|
||||
platform::openURL(url);
|
||||
if (!menu->back()) {
|
||||
menu->reset();
|
||||
}
|
||||
});
|
||||
return 0;
|
||||
}
|
||||
|
||||
/// @brief Quit the game
|
||||
static int l_quit(lua::State*) {
|
||||
engine->quit();
|
||||
@@ -284,6 +307,7 @@ const luaL_Reg corelib[] = {
|
||||
{"str_setting", lua::wrap<l_str_setting>},
|
||||
{"get_setting_info", lua::wrap<l_get_setting_info>},
|
||||
{"open_folder", lua::wrap<l_open_folder>},
|
||||
{"open_url", lua::wrap<l_open_url>},
|
||||
{"quit", lua::wrap<l_quit>},
|
||||
{"capture_output", lua::wrap<l_capture_output>},
|
||||
{NULL, NULL}
|
||||
|
||||
+36
-1
@@ -65,14 +65,31 @@ int platform::get_process_id() {
|
||||
return GetCurrentProcessId();
|
||||
}
|
||||
|
||||
bool platform::openURL(const std::string& url) {
|
||||
if (url.empty()) return false;
|
||||
// UTF-8 → UTF-16
|
||||
int wlen = MultiByteToWideChar(CP_UTF8, 0, url.c_str(), -1, nullptr, 0);
|
||||
if (wlen <= 0) return false;
|
||||
|
||||
std::wstring wurl(wlen, L'\0');
|
||||
MultiByteToWideChar(CP_UTF8, 0, url.c_str(), -1, &wurl[0], wlen);
|
||||
|
||||
HINSTANCE result = ShellExecuteW(
|
||||
nullptr, L"open", wurl.c_str(), nullptr, nullptr, SW_SHOWNORMAL
|
||||
);
|
||||
|
||||
return reinterpret_cast<intptr_t>(result) > 32;
|
||||
}
|
||||
|
||||
#else // _WIN32
|
||||
|
||||
#include <unistd.h>
|
||||
#include <sys/wait.h>
|
||||
#include "frontend/locale.hpp"
|
||||
|
||||
void platform::configure_encoding() {
|
||||
}
|
||||
|
||||
|
||||
std::string platform::detect_locale() {
|
||||
const char* const programLocaleName = setlocale(LC_ALL, nullptr);
|
||||
const char* const preferredLocaleName =
|
||||
@@ -92,6 +109,24 @@ void platform::sleep(size_t millis) {
|
||||
int platform::get_process_id() {
|
||||
return getpid();
|
||||
}
|
||||
|
||||
bool platform::openURL(const std::string& url) {
|
||||
if (url.empty()) return false;
|
||||
pid_t pid = fork();
|
||||
if (pid == 0) {
|
||||
#ifdef __APPLE__
|
||||
execlp("open", "open", url.c_str(), (char*)nullptr);
|
||||
#else
|
||||
execlp("xdg-open", "xdg-open", url.c_str(), (char*)nullptr);
|
||||
#endif
|
||||
_exit(127);
|
||||
} else if (pid > 0) {
|
||||
int status = 0;
|
||||
waitpid(pid, &status, 0);
|
||||
return WIFEXITED(status) && WEXITSTATUS(status) == 0;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
#endif // _WIN32
|
||||
|
||||
void platform::open_folder(const std::filesystem::path& folder) {
|
||||
|
||||
@@ -13,4 +13,5 @@ namespace platform {
|
||||
/// Makes the current thread sleep for the specified amount of milliseconds.
|
||||
void sleep(size_t millis);
|
||||
int get_process_id();
|
||||
bool openURL(const std::string& url);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user