nf7/nf7
nf7/nf7
1
0
Fork 0
Code Issues 9 Pull Requests Projects 3 Releases 5 Wiki Activity

implement System/Dir UI

Browse Source
This commit is contained in:
falsycat 2022-05-23 12:38:18 +09:00
parent 4f9ef8e8c2
commit 6b7fffe167
5 changed files with 307 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -43,6 +43,7 @@ target_sources(nf7
nf7.hh
common/dir.hh
common/gui_window.hh
common/queue.hh
common/type_info.hh
common/yas.hh

16
common/dir.hh
View File

@ -33,7 +33,16 @@ class Dir::DuplicateException : public Exception {
class DirItem : public File::Interface {
public:
DirItem() = default;
enum Flag : uint8_t {
kNone = 0,
kTree = 1 << 0,
kMenu = 1 << 1,
kTooltip = 1 << 2,
};
using Flags = uint8_t;
DirItem(Flags flags) noexcept : flags_(flags) {
}
virtual ~DirItem() = default;
DirItem(const DirItem&) = delete;
DirItem(DirItem&&) = delete;
@ -43,6 +52,11 @@ class DirItem : public File::Interface {
virtual void UpdateTree() noexcept { }
virtual void UpdateMenu() noexcept { }
virtual void UpdateTooltip() noexcept { }
Flags flags() const noexcept { return flags_; }
private:
Flags flags_;
};
} // namespace nf7

85
common/gui_window.hh Normal file
View File

@ -0,0 +1,85 @@
#pragma once
#include <utility>
#include <string>
#include <string_view>
#include <imgui.h>
#include <yas/serialize.hpp>
#include <yas/types/utility/usertype.hpp>
#include "nf7.hh"
namespace nf7::gui {
class Window {
public:
Window() = delete;
Window(File& owner, std::string_view title, const gui::Window* src = nullptr) noexcept :
owner_(&owner), title_(title),
shown_(src? src->shown_: false) {
}
Window(const Window&) = delete;
Window(Window&&) = delete;
Window& operator=(const Window&) = delete;
Window& operator=(Window&&) = delete;
bool Begin() noexcept {
if (std::exchange(set_focus_, false)) {
ImGui::SetNextWindowFocus();
shown_ = true;
}
if (std::exchange(set_shown_, false)) {
shown_ = true;
}
if (std::exchange(set_close_, false)) {
shown_ = false;
}
return shown_ && ImGui::Begin(id().c_str(), &shown_);
}
void End() noexcept {
if (shown_) ImGui::End();
}
void SetFocus() noexcept {
set_focus_ = true;
}
void Show() noexcept {
set_shown_ = true;
}
void Close() noexcept {
set_close_ = true;
}
void MenuItem_ToggleShown(const char* text) noexcept {
if (ImGui::MenuItem(text, nullptr, shown_)) {
shown_? Close(): Show();
}
}
template <typename Ar>
Ar& serialize(Ar& ar) {
ar(shown_);
return ar;
}
std::string id() const noexcept {
return owner_->abspath().Stringify() + " | " + title_;
}
bool shown() const noexcept { return shown_; }
private:
File* const owner_;
std::string title_;
bool set_focus_ = false;
bool set_shown_ = false;
bool set_close_ = false;
// persistent params
bool shown_;
};
} // namespace nf7::gui

209
file/system_dir.cc
View File

@ -3,6 +3,8 @@
#include <string>
#include <string_view>
#include <imgui.h>
#include <imgui_stdlib.h>
#include <yas/serialize.hpp>
#include <yas/types/std/map.hpp>
#include <yas/types/std/string.hpp>
@ -10,6 +12,7 @@
#include "nf7.hh"
#include "common/dir.hh"
#include "common/gui_window.hh"
#include "common/ptr_selector.hh"
#include "common/type_info.hh"
#include "common/yas.hh"
@ -18,21 +21,23 @@
namespace nf7 {
namespace {
class Dir final : public File, public nf7::Dir {
class Dir final : public File, public nf7::Dir, public nf7::DirItem {
public:
static inline const GenericTypeInfo<Dir> kType = {"System", "Dir", {"DirItem"}};
using ItemMap = std::map<std::string, std::unique_ptr<File>>;
Dir(Env& env, ItemMap&& items = {}, bool shown = false) noexcept :
File(kType, env), items_(std::move(items)), shown_(shown) {
Dir(Env& env, ItemMap&& items = {}, const gui::Window* src = nullptr) noexcept :
File(kType, env),
DirItem(DirItem::kTree | DirItem::kMenu | DirItem::kTooltip),
items_(std::move(items)), win_(*this, "TreeView System/Dir", src) {
}
Dir(Env& env, Deserializer& ar) : Dir(env) {
ar(items_, shown_);
ar(items_, win_);
}
void Serialize(Serializer& ar) const noexcept override {
ar(items_, shown_);
ar(items_, win_);
}
std::unique_ptr<File> Clone(Env& env) const noexcept override {
ItemMap items;
@ -70,6 +75,9 @@ class Dir final : public File, public nf7::Dir {
}
void Update() noexcept override;
void UpdateTree() noexcept override;
void UpdateMenu() noexcept override;
void UpdateTooltip() noexcept override;
void Handle(const Event& ev) noexcept override {
switch (ev.type) {
@ -79,23 +87,206 @@ class Dir final : public File, public nf7::Dir {
case Event::kRemove:
for (const auto& item : items_) item.second->Isolate();
break;
case Event::kReqFocus:
win_.SetFocus();
break;
default:
;
break;
}
}
File::Interface* iface(const std::type_info& t) noexcept override {
return PtrSelector<nf7::Dir>(t).Select(this);
return InterfaceSelector<nf7::Dir, nf7::DirItem>(t).Select(this);
}
private:
ItemMap items_;
bool open_popup_new_ = false;
bool shown_;
// persistent params
ItemMap items_;
gui::Window win_;
};
void Dir::Update() noexcept {
const auto em = ImGui::GetFontSize();
const auto& style = ImGui::GetStyle();
// update children
for (const auto& item : items_) {
ImGui::PushID(item.second.get());
item.second->Update();
ImGui::PopID();
}
// new item popup
if (ImGui::BeginPopup("NewItemPopup")) {
static const TypeInfo* selecting = nullptr;
static std::string cat_filter = "";
static std::string name_filter = "";
static std::string name = "";
ImGui::TextUnformatted("adding new item...");
const auto left = ImGui::GetCursorPosX();
ImGui::SetNextItemWidth(6*em);
ImGui::InputTextWithHint("##cat_filter", "category", &cat_filter);
ImGui::SameLine();
ImGui::SetNextItemWidth(6*em);
ImGui::InputTextWithHint("##name_filter", "name", &name_filter);
ImGui::SameLine();
const auto right = ImGui::GetCursorPosX() - style.ItemSpacing.x;
ImGui::NewLine();
if (ImGui::BeginListBox("type", {right-left, 4*em})) {
for (const auto& reg : registry()) {
const auto& t = *reg.second;
if (!t.flags().contains("DirItem")) continue;
if (!t.flags().contains("File_Factory")) continue;
const bool cat_match =
cat_filter.empty() || t.cat().find(cat_filter) != std::string::npos;
const bool name_match =
name_filter.empty() || t.name().find(name_filter) != std::string::npos;
const bool sel = (selecting == &t);
if (!cat_match || !name_match) {
if (sel) selecting = nullptr;
continue;
}
ImGui::PushID(&t);
constexpr auto kFlags =
ImGuiSelectableFlags_SpanAllColumns |
ImGuiSelectableFlags_AllowItemOverlap;
if (ImGui::Selectable("##selectable", sel, kFlags)) {
selecting = &t;
}
ImGui::SameLine();
ImGui::Text("%s / %s", t.cat().c_str(), t.name().c_str());
ImGui::PopID();
}
ImGui::EndListBox();
}
ImGui::SetNextItemWidth(right-left);
ImGui::InputText("name", &name);
ImGui::Spacing();
bool err = false;
if (selecting == nullptr) {
ImGui::Bullet(); ImGui::TextUnformatted("type is not selected");
err = true;
}
try {
Path::ValidateTerm(name);
} catch (Exception& e) {
ImGui::Bullet(); ImGui::Text("invalid name: %s", e.msg().c_str());
err = true;
}
if (!err) {
if (ImGui::Button("ok")) {
ImGui::CloseCurrentPopup();
// TODO: delegate to Context
auto task = [this, name = std::move(name), type = selecting]() {
Add(name, type->Create(env()));
};
env().ExecMain(0, std::move(task));
}
if (ImGui::IsItemHovered()) {
ImGui::SetTooltip(
"create %s/%s as %s",
selecting->cat().c_str(), selecting->name().c_str(), name.c_str());
}
}
ImGui::EndPopup();
}
// tree view window
const char* popup = nullptr;
ImGui::SetNextWindowSize({8*em, 8*em}, ImGuiCond_FirstUseEver);
if (win_.Begin()) {
if (ImGui::BeginPopupContextWindow()) {
if (ImGui::MenuItem("new")) {
popup = "NewItemPopup";
}
ImGui::Separator();
UpdateMenu();
ImGui::EndPopup();
}
UpdateTree();
}
win_.End();
if (popup) ImGui::OpenPopup(popup);
}
void Dir::UpdateTree() noexcept {
for (const auto& item : items_) {
ImGuiTreeNodeFlags flags =
ImGuiTreeNodeFlags_NoTreePushOnOpen |
ImGuiTreeNodeFlags_SpanFullWidth;
const auto& name = item.first;
auto& file = *item.second;
ImGui::PushID(&file);
auto* ditem = file.iface<nf7::DirItem>();
if (ditem && !(ditem->flags() & DirItem::kTree)) {
flags |= ImGuiTreeNodeFlags_Leaf;
}
const bool open = ImGui::TreeNodeEx(
item.second.get(), flags, "%s", name.c_str());
// tooltip
if (ImGui::IsItemHovered()) {
ImGui::BeginTooltip();
ImGui::TextUnformatted(file.type().name().c_str());
ImGui::SameLine();
ImGui::TextDisabled(file.abspath().Stringify().c_str());
if (ditem && (ditem->flags() & DirItem::kTooltip)) {
ImGui::Indent();
ditem->UpdateTooltip();
ImGui::Unindent();
}
ImGui::EndTooltip();
}
// context menu
if (ImGui::BeginPopupContextItem()) {
if (ImGui::MenuItem("copy path")) {
}
ImGui::Separator();
if (ImGui::MenuItem("remove")) {
// TODO: delegate to Context
env().ExecMain(0, [this, name]() { Remove(name); });
}
if (ImGui::MenuItem("rename")) {
env().ExecMain(0, []() { throw Exception("not implemented"); });
}
if (ditem && (ditem->flags() & DirItem::kMenu)) {
ImGui::Separator();
ditem->UpdateMenu();
}
ImGui::EndPopup();
}
// displayed contents
if (open) {
ImGui::TreePush(&file);
if (ditem && (ditem->flags() & DirItem::kTree)) {
ditem->UpdateTree();
}
ImGui::TreePop();
}
ImGui::PopID();
}
}
void Dir::UpdateMenu() noexcept {
win_.MenuItem_ToggleShown("TreeView");
}
void Dir::UpdateTooltip() noexcept {
ImGui::Text("children: %zu", items_.size());
}
}

12
tool/init.cc
View File

@ -32,19 +32,19 @@ struct serializer<
}
template <typename... Args>
L Write(Ar& ar, Args&&... args) {
return [...args = std::forward<Args>(args), &ar]() mutable {
ar(std::forward<Args>(args)...);
};
L Write(Ar& ar, const Args&... args) {
return [&args..., &ar]() { ar(args...); };
}
int main(void) {
yas::mem_ostream os;
Ar ar(os);
# define WINDOW_(shown) shown
ar("Dir"s);
ar(std::map<std::string, L> {
{ "home"s, Write(ar, "Dir"s, std::map<std::string, L> {}, false) },
}, false);
{ "home"s, Write(ar, "Dir"s, std::map<std::string, L> {}, WINDOW_(false)) },
}, WINDOW_(true));
const auto buf = os.get_shared_buffer();
for (size_t i = 0; i < buf.size;) {