srctree

Robin Linden parent 7f4b468e 07c07c55
deps: Update imgui and imgui-sfml

browser/gui was updated to fix discarding a now-nondiscard return value.

imgui contained a breaking change that required a newer version ofimgui-sfml.

inline split

.bazelrc added: 18, removed: 10, total 8

@@ -70,6 +70,8 @@ build:linux --per_file_copt='external/honggfuzz[:/]@-Wno-shadow'

build:linux --per_file_copt='external/honggfuzz[:/]@-Wno-undef'

build:linux --per_file_copt='external/imgui-sfml[:/]@-Wno-double-promotion'

build:linux --per_file_copt='external/imgui-sfml[:/]@-Wno-implicit-fallthrough'

build:linux --per_file_copt='external/imgui-sfml[:/]@-Wno-missing-declarations'

build:linux --per_file_copt='external/imgui-sfml[:/]@-Wno-switch'

build:linux --per_file_copt='external/imgui[:/]@-Wno-deprecated-enum-enum-conversion'

build:linux --per_file_copt='external/imgui[:/]@-Wno-double-promotion'

build:linux --per_file_copt='external/libpng[:/]@-Wno-null-pointer-subtraction'

@@ -132,6 +134,7 @@ build:windows --per_file_copt='external/freetype2[:/]@/wd4267' # C4267: '=': con

build:windows --per_file_copt='external/freetype2[:/]@/wd4701' # C4701: potentially uninitialized local variable 'cbox' used

build:windows --per_file_copt='external/ftxui[:/]@/wd4244' # C4244: '=': conversion from 'int' to 'uint8_t', possible loss of data

build:windows --per_file_copt='external/ftxui[:/]@/wd4267' # C4267: '=': conversion from 'size_t' to 'int', possible loss of data

build:windows --per_file_copt='external/imgui-sfml[:/]@/wd4244' # C4244: 'argument': conversion from 'const unsigned int' to 'float', possible loss of data

build:windows --per_file_copt='external/sfml[:/]@/wd4100' # C4100: 'visible': unreferenced formal parameter

build:windows --per_file_copt='external/sfml[:/]@/wd4244' # C4244: 'initializing': conversion from 'sf::Uint32' to 'sf::Uint8', possible loss of data

build:windows --per_file_copt='external/sfml[:/]@/wd4456' # C4456: declaration of 'i' hides previous local declaration

WORKSPACE added: 18, removed: 10, total 8

@@ -104,17 +104,17 @@ http_archive(

http_archive(

name = "imgui", # MIT

build_file = "//third_party:imgui.BUILD",

sha256 = "9f14c788aee15b777051e48f868c5d4d959bd679fc5050e3d2a29de80d8fd32e",

strip_prefix = "imgui-1.88",

url = "https://github.com/ocornut/imgui/archive/v1.88.tar.gz",

sha256 = "4038b05bd44c889cf40be999656d3871a0559916708cb52a6ae2fa6fa35c5c60",

strip_prefix = "imgui-1.89",

url = "https://github.com/ocornut/imgui/archive/v1.89.tar.gz",

)

http_archive(

name = "imgui-sfml", # MIT

build_file = "//third_party:imgui-sfml.BUILD",

sha256 = "848315ec333c8d2e1f5cf0722408f2f5e2fb0de49936d1e9cd23c591193b8905",

strip_prefix = "imgui-sfml-3dd9b4d35c7caf21c81231410e2c4785d40d418d",

url = "https://github.com/eliasdaler/imgui-sfml/archive/3dd9b4d35c7caf21c81231410e2c4785d40d418d.tar.gz",

sha256 = "c9f5f5ed92ad30afb64f32e2e0d4b4050c59de465f759330e972b90891798581",

strip_prefix = "imgui-sfml-49dbecb43040449cccb3bfc43e3472cee94da417",

url = "https://github.com/eliasdaler/imgui-sfml/archive/49dbecb43040449cccb3bfc43e3472cee94da417.tar.gz",

)

http_archive(

browser/gui/app.cpp added: 18, removed: 10, total 8

@@ -19,6 +19,7 @@

#include <spdlog/spdlog.h>

#include <cmath>

#include <cstdlib>

#include <functional>

#include <optional>

#include <sstream>

@@ -109,7 +110,11 @@ App::App(std::string browser_title, std::string start_page_hint, bool load_start

url_buf_{std::move(start_page_hint)} {

window_.setFramerateLimit(60);

window_.setMouseCursor(cursor_);

ImGui::SFML::Init(window_);

if (ImGui::SFML::Init(window_)) {

spdlog::critical("imgui-sfml initialization failed");

std::abort();

}

canvas_->set_viewport_size(window_.getSize().x, window_.getSize().y);

engine_.set_layout_width(window_.getSize().x / scale_);