diff --git a/tools/build/rbuilder/projects/default.slp b/tools/build/rbuilder/projects/default.slp index a48b573..bff1c0b 100644 --- a/tools/build/rbuilder/projects/default.slp +++ b/tools/build/rbuilder/projects/default.slp @@ -20,7 +20,7 @@ local default = { project = { project_name = { index = 1, value = "default", ptype = "string", slen = 64 }, - project_path = { index = 2, value = "./", ptype = "path", slen = 256 }, -- Always starts empty. Will support a project file. + project_path = { index = 2, value = "F:\\dev\\luajit\\Thunc\\sokol-luajit", ptype = "path", slen = 256 }, -- Always starts empty. Will support a project file. project_file = { index = 3, value = "default.slp", ptype = "file", slen = 64 }, -- Sokol luajit project file project_start = { index = 4, value = "example1.lua", ptype = "file", slen = 128 }, }, diff --git a/tools/build/rbuilder/ui/panels.lua b/tools/build/rbuilder/ui/panels.lua index 756e198..952ade9 100644 --- a/tools/build/rbuilder/ui/panels.lua +++ b/tools/build/rbuilder/ui/panels.lua @@ -95,7 +95,8 @@ local folder_select = { if(bhit) then udata.hit = bhit if(bhit[2] == "..") then - udata.folder_path = udata.folder_path:match("(.-)[^\\]-[^%.]+$") + udata.folder_path = udata.folder_path:match("(.-)[^\\]-$") + print(udata.folder_path) if(udata.folder_path == nil or udata.folder_path == "") then udata.folder_path = "." end else udata.folder_path = udata.folder_path.."\\"..udata.hit[2] @@ -193,6 +194,7 @@ local function display_section(ctx, sectionname) nk.nk_layout_row_push(ctx, 30) if(nk.nk_button_label(ctx, "") == true) then folder_select.popup_active = 1 + folder_select.folder_path = v.value end nk.nk_style_set_font(ctx, myfonts[3].handle) elseif(v.ptype == "file") then