ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-05 15:18:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Stylistic improvements to new comdlg helpers.

Browse Source
This commit is contained in:
Jeroen van Rijn
2019-03-09 13:48:48 +01:00
parent 4446a1431a
commit 4f24f1172e
1 changed files with 33 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/sys/win32/comdlg32.odin
+33 -24
View File
@@ -75,14 +75,15 @@ SAVE_TITLE :: "Select file to save";
SAVE_FLAGS :: u32(OFN_OVERWRITEPROMPT | OFN_EXPLORER); SAVE_FLAGS :: u32(OFN_OVERWRITEPROMPT | OFN_EXPLORER);
SAVE_EXT :: "txt"; SAVE_EXT :: "txt";
OpenSaveMode :: enum{ Open_Save_Mode :: enum {
Open = 0, Open = 0,
Save = 1, Save = 1,
} }
_open_file_dialog :: proc(title: string, dir: string, filters: []string, default_filter: u32, flags: u32, default_ext: string, mode: OpenSaveMode, allocator := context.temp_allocator) -> (path: string, ok: bool) { _open_file_dialog :: proc(title: string, dir: string,
ok = true; filters: []string, default_filter: u32,
flags: u32, default_ext: string,
mode: Open_Save_Mode, allocator := context.temp_allocator) -> (path: string, ok: bool = true) {
file_buf := make([]u16, MAX_PATH_WIDE, allocator); file_buf := make([]u16, MAX_PATH_WIDE, allocator);
// Filters need to be passed as a pair of strings (title, filter) // Filters need to be passed as a pair of strings (title, filter)
@@ -90,28 +91,31 @@ _open_file_dialog :: proc(title: string, dir: string, filters: []string, default
if filter_len % 2 != 0 do return "", false; if filter_len % 2 != 0 do return "", false;
default_filter = clamp(default_filter, 1, filter_len / 2); default_filter = clamp(default_filter, 1, filter_len / 2);
filter := strings.join(filters, "\u0000", context.temp_allocator); filter: string;
filter = strings.concatenate({filter, "\u0000"}, context.temp_allocator); filter = strings.join(filters, "\u0000", context.temp_allocator);
filter_w := utf8_to_wstring(filter, context.temp_allocator); filter = strings.concatenate({filter, "\u0000"}, context.temp_allocator);
ofn := Open_File_Name_W{ ofn := Open_File_Name_W{
struct_size = size_of(Open_File_Name_W), struct_size = size_of(Open_File_Name_W),
file = Wstring(&file_buf[0]), file = Wstring(&file_buf[0]),
max_file = MAX_PATH_WIDE, max_file = MAX_PATH_WIDE,
title = utf8_to_wstring(title, context.temp_allocator), title = utf8_to_wstring(title, context.temp_allocator),
filter = filter_w, filter = utf8_to_wstring(filter, context.temp_allocator),
initial_dir = utf8_to_wstring(dir, context.temp_allocator), initial_dir = utf8_to_wstring(dir, context.temp_allocator),
filter_index = u32(default_filter), filter_index = u32(default_filter),
def_ext = utf8_to_wstring(default_ext, context.temp_allocator), def_ext = utf8_to_wstring(default_ext, context.temp_allocator),
flags = u32(flags), flags = u32(flags),
}; };
if mode == OpenSaveMode.Open { switch mode {
ok = bool(get_open_file_name_w(&ofn)); case .Open:
} else if mode == OpenSaveMode.Save { ok = bool(get_open_file_name_w(&ofn));
case .Save:
ok = bool(get_save_file_name_w(&ofn)); ok = bool(get_save_file_name_w(&ofn));
} else do ok = false; case:
ok = false;
}
if !ok { if !ok {
delete(file_buf); delete(file_buf);
return "", false; return "", false;
@@ -122,15 +126,20 @@ _open_file_dialog :: proc(title: string, dir: string, filters: []string, default
return; return;
} }
select_file_to_open :: proc(title := OPEN_TITLE, dir := ".", filters := []string{"All Files", "*.*"}, default_filter := u32(1), flags := OPEN_FLAGS, allocator := context.temp_allocator) -> (path: string, ok: bool) { select_file_to_open :: proc(title := OPEN_TITLE, dir := ".",
filters := []string{"All Files", "*.*"}, default_filter := u32(1),
flags := OPEN_FLAGS, allocator := context.temp_allocator) -> (path: string, ok: bool) {
path, ok = _open_file_dialog(title, dir, filters, default_filter, flags, "", OpenSaveMode.Open, allocator); path, ok = _open_file_dialog(title, dir, filters, default_filter, flags, "", Open_Save_Mode.Open, allocator);
return; return;
} }
select_file_to_save :: proc(title := SAVE_TITLE, dir := ".", filters := []string{"All Files", "*.*"}, default_filter := u32(1), flags := SAVE_FLAGS, default_ext := SAVE_EXT, allocator := context.temp_allocator) -> (path: string, ok: bool) { select_file_to_save :: proc(title := SAVE_TITLE, dir := ".",
filters := []string{"All Files", "*.*"}, default_filter := u32(1),
flags := SAVE_FLAGS, default_ext := SAVE_EXT,
allocator := context.temp_allocator) -> (path: string, ok: bool) {
path, ok = _open_file_dialog(title, dir, filters, default_filter, flags, default_ext, OpenSaveMode.Save, allocator); path, ok = _open_file_dialog(title, dir, filters, default_filter, flags, default_ext, Open_Save_Mode.Save, allocator);
return; return;
} }