Skip to content

Commit 2f3b3b6

Browse files
committed
Revert "compile errors fixed"
This reverts commit 40ef92e. Revert "Update ubuntu-ci.yml" This reverts commit 5441138. Revert "vcpkg.json updated" This reverts commit 2506565.
1 parent 40ef92e commit 2f3b3b6

File tree

4 files changed

+11
-9
lines changed

4 files changed

+11
-9
lines changed

.github/workflows/ubuntu-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
setupOnly: true
4141
# Location of the vcpkg as submodule of the repository.
4242
vcpkgDirectory: '${{ github.workspace }}/vcpkg'
43-
vcpkgGitCommitId: '9224b3bbd8df24999d85720b1d005dd6f969ade0'
43+
vcpkgGitCommitId: '50fd3d9957195575849a49fa591e645f1d8e7156'
4444
# Since the cache must be invalidated when content of the vcpkg.json file changes, let's
4545
# compute its hash and append this to the computed cache's key.
4646
appendedCacheKey: ${{ hashFiles( '**/vcpkg.json' ) }}

external/ImFileDialog/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@ target_include_directories(im_file_dialog PUBLIC .)
77
find_package(imgui CONFIG REQUIRED)
88
target_link_libraries(im_file_dialog imgui::imgui)
99

10+
find_path(STB_INCLUDE_DIRS "stb.h")
11+
target_include_directories(im_file_dialog PRIVATE ${STB_INCLUDE_DIRS})

source/Gui/BrowserWindow.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1043,7 +1043,7 @@ void _BrowserWindow::processEmojiWindow()
10431043
}
10441044
ImGui::SetCursorPosY(ImGui::GetCursorPosY() + scale(8.0f));
10451045

1046-
if (AlienImGui::Button("More", ImGui::GetContentRegionAvail().x)) {
1046+
if (AlienImGui::Button("More", ImGui::GetContentRegionAvailWidth())) {
10471047
_showAllEmojis = true;
10481048
}
10491049
}
@@ -1110,8 +1110,8 @@ void _BrowserWindow::processShortenedText(std::string const& text, bool bold) {
11101110
}
11111111
auto& styleRepository = StyleRepository::getInstance();
11121112
auto textSize = ImGui::CalcTextSize(substrings.at(0).c_str());
1113-
auto needDetailButton = textSize.x > ImGui::GetContentRegionAvail().x || substrings.size() > 1;
1114-
auto cursorPos = ImGui::GetCursorPosX() + ImGui::GetContentRegionAvail().x - styleRepository.scale(15.0f);
1113+
auto needDetailButton = textSize.x > ImGui::GetContentRegionAvailWidth() || substrings.size() > 1;
1114+
auto cursorPos = ImGui::GetCursorPosX() + ImGui::GetContentRegionAvailWidth() - styleRepository.scale(15.0f);
11151115
if (bold) {
11161116
ImGui::PushFont(styleRepository.getSmallBoldFont());
11171117
}

vcpkg.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"dependencies": [
55
{
66
"name": "glew",
7-
"version>=": "2.2.0#3"
7+
"version>=": "2.2.0"
88
},
99
{
1010
"name": "imgui",
@@ -29,7 +29,7 @@
2929
},
3030
{
3131
"name": "stb",
32-
"version>=": "2023-04-11#1"
32+
"version>=": "2020-09-14#1"
3333
},
3434
{
3535
"name": "boost-core",
@@ -53,7 +53,7 @@
5353
},
5454
{
5555
"name": "cereal",
56-
"version>=": "1.3.2"
56+
"version>=": "1.3.0"
5757
},
5858
{
5959
"name": "gtest",
@@ -67,12 +67,12 @@
6767
},
6868
{
6969
"name": "openssl",
70-
"version>=": "3.3.0"
70+
"version>=": "1.1.1l"
7171
},
7272
{
7373
"name": "cli11"
7474
}
7575
],
76-
"builtin-baseline": "9224b3bbd8df24999d85720b1d005dd6f969ade0"
76+
"builtin-baseline": "d48ac9aa527620d43fb3b3327d0b9e054de203c2"
7777
}
7878

0 commit comments

Comments
 (0)