diff options
| -rw-r--r-- | build_win32.bat | 2 | ||||
| -rw-r--r-- | imgui/imconfig.h | 2 | ||||
| -rw-r--r-- | misc/folder.png | bin | 0 -> 420 bytes | |||
| -rw-r--r-- | misc/search.png | bin | 0 -> 568 bytes | |||
| -rw-r--r-- | src/definitions.h | 6 | ||||
| -rw-r--r-- | src/image.cpp | 10 | ||||
| -rw-r--r-- | src/image.h | 2 | ||||
| -rw-r--r-- | src/main.cpp | 4 |
8 files changed, 23 insertions, 3 deletions
diff --git a/build_win32.bat b/build_win32.bat index 3ec3c7a..a8c2cf4 100644 --- a/build_win32.bat +++ b/build_win32.bat @@ -7,7 +7,7 @@ call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary @set SOURCES=imgui/imgui*.cpp src/*.cpp @set LIBS=opengl32.lib Advapi32.lib Shell32.lib bin/debug/data.obj bin/debug/icon.res windres misc/icon.rc -O coff -o bin/debug/icon.res -ld -r -b binary -o bin/debug/data.obj LICENSE misc/logo_64.png imgui/LICENSE imspinner/LICENSE +ld -r -b binary -o bin/debug/data.obj LICENSE misc/logo_64.png imgui/LICENSE imspinner/LICENSE misc/search.png misc/folder.png mkdir %OUT_DIR% cl /nologo /Zi /MD /EHsc /utf-8 %INCLUDES% /D UNICODE /D _UNICODE %SOURCES% /Fe%OUT_DIR%/%OUT_EXE%.exe /Fd%OUT_DIR%/vc140.pdb /Fo%OUT_DIR%/ /link %LIBS% if "%1"=="-r" call "bin/debug/text-search.exe" diff --git a/imgui/imconfig.h b/imgui/imconfig.h index d556cba..13166d8 100644 --- a/imgui/imconfig.h +++ b/imgui/imconfig.h @@ -27,7 +27,7 @@ //#define IMGUI_API __declspec( dllimport ) //---- Don't define obsolete functions/enums/behaviors. Consider enabling from time to time after updating to clean your code of obsolete function/names. -//#define IMGUI_DISABLE_OBSOLETE_FUNCTIONS +#define IMGUI_DISABLE_OBSOLETE_FUNCTIONS //#define IMGUI_DISABLE_OBSOLETE_KEYIO // 1.87+ disable legacy io.KeyMap[]+io.KeysDown[] in favor io.AddKeyEvent(). This is automatically done by IMGUI_DISABLE_OBSOLETE_FUNCTIONS. //---- Disable all of Dear ImGui or don't implement standard windows/tools. diff --git a/misc/folder.png b/misc/folder.png Binary files differnew file mode 100644 index 0000000..f9e1d7c --- /dev/null +++ b/misc/folder.png diff --git a/misc/search.png b/misc/search.png Binary files differnew file mode 100644 index 0000000..6241bc0 --- /dev/null +++ b/misc/search.png diff --git a/src/definitions.h b/src/definitions.h index a078c09..ede3d3f 100644 --- a/src/definitions.h +++ b/src/definitions.h @@ -17,6 +17,12 @@ extern unsigned char _binary_imspinner_LICENSE_end[]; extern unsigned char _binary_misc_logo_64_png_start[]; extern unsigned char _binary_misc_logo_64_png_end[]; + +extern unsigned char _binary_misc_search_png_start[]; +extern unsigned char _binary_misc_search_png_end[]; + +extern unsigned char _binary_misc_folder_png_start[]; +extern unsigned char _binary_misc_folder_png_end[]; } #endif
\ No newline at end of file diff --git a/src/image.cpp b/src/image.cpp index ce0d739..e7df8b8 100644 --- a/src/image.cpp +++ b/src/image.cpp @@ -5,6 +5,8 @@ #include "../stb_image.h" ts_image img_logo; +ts_image img_search; +ts_image img_folder; // Simple helper function to load an image into a OpenGL texture with common settings static bool _ts_load_texture(unsigned char* data, unsigned long size, GLuint* out_texture, int* out_width, int* out_height) @@ -54,4 +56,12 @@ void ts_load_images() { int size = _binary_misc_logo_64_png_end - _binary_misc_logo_64_png_start; unsigned char* data = (unsigned char *)_binary_misc_logo_64_png_start; img_logo = _ts_load_image(data, size); + + size = _binary_misc_search_png_end - _binary_misc_search_png_start; + data = (unsigned char *)_binary_misc_search_png_start; + img_search = _ts_load_image(data, size); + + size = _binary_misc_folder_png_end - _binary_misc_folder_png_start; + data = (unsigned char *)_binary_misc_folder_png_start; + img_folder = _ts_load_image(data, size); }
\ No newline at end of file diff --git a/src/image.h b/src/image.h index 3906132..21f3438 100644 --- a/src/image.h +++ b/src/image.h @@ -15,6 +15,8 @@ typedef struct t_ts_image { } ts_image; extern ts_image img_logo; +extern ts_image img_search; +extern ts_image img_folder; void ts_load_images(); diff --git a/src/main.cpp b/src/main.cpp index 23cf990..5dc0f04 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -328,6 +328,8 @@ void ts_create_gui(int window_w, int window_h) { ImGui::BeginChild("search-boxes2", ImVec2(frame_w, textbox_area_height), false); { ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 1.0f); + ImGui::ImageButton("Folder", (void*)(intptr_t)img_folder.id, ImVec2(18.0f, 18.0f)); + ImGui::SameLine(); ImGui::PushItemWidth(-1); if (ImGui::InputTextWithHint("filter-ti", "Filter", filter_buffer, MAX_INPUT_LENGTH, ImGuiInputTextFlags_EnterReturnsTrue)) { ts_start_search(path_buffer, filter_buffer, query_buffer, ts_thread_count, max_file_size); @@ -341,7 +343,7 @@ void ts_create_gui(int window_w, int window_h) { } else { ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 1.0f); - if (ImGui::Button("Search")) { + if (ImGui::ImageButton("Search", (void*)(intptr_t)img_search.id, ImVec2(18.0f, 18.0f))) { ts_start_search(path_buffer, filter_buffer, query_buffer, ts_thread_count, max_file_size); } ImGui::PopStyleVar(); |
