Compare commits

..

No commits in common. "a6814030ee44c175fc34ddc9f3bdee2c102c6d01" and "abcf2adc569d3e243ade77fa2e6a557eaba3b9d4" have entirely different histories.

4 changed files with 3 additions and 8 deletions

View File

@ -8,7 +8,7 @@
namespace studio {
TaskState FileDialogManager::update(turbine::Context &ctx) noexcept {
studio::TaskState FileDialogManager::update(turbine::Context &ctx) noexcept {
switch (m_state) {
case UpdateProjectPathState::EnableSystemCursor: {
// switch to system cursor in this update and open file dialog in the next

View File

@ -34,7 +34,7 @@ void setClipboardText(Context &ctx, ox::StringViewCR text) noexcept;
void setClipboardObject(Context &ctx, ox::UPtr<BaseClipboardObject> &&obj) noexcept;
ox::Result<BaseClipboardObject*> getClipboardData(Context &ctx, ox::StringViewCR typeId) noexcept;
ox::Result<BaseClipboardObject*> getClipboardData(Context &ctx, ox::StringView typeId) noexcept;
template<typename T>
ox::Result<T*> getClipboardObject(Context &ctx) noexcept {

View File

@ -5,7 +5,6 @@
#include <ox/std/string.hpp>
#include <turbine/context.hpp>
#include <turbine/clipboard.hpp>
namespace turbine {
@ -16,8 +15,4 @@ ox::String getClipboardText(Context&) noexcept {
void setClipboardText(Context&, ox::StringViewCR) noexcept {
}
ox::Result<BaseClipboardObject*> getClipboardData(Context&, ox::StringViewCR) noexcept {
return ox::Error{1, "not implemented"};
}
}

View File

@ -28,7 +28,7 @@ void setClipboardObject(Context &ctx, ox::UPtr<BaseClipboardObject> &&obj) noexc
ctx.clipboard = std::move(obj);
}
ox::Result<BaseClipboardObject*> getClipboardData(Context &ctx, ox::StringViewCR typeId) noexcept {
ox::Result<BaseClipboardObject*> getClipboardData(Context &ctx, ox::StringView typeId) noexcept {
if (ctx.clipboard && ctx.clipboard->typeId() == typeId) {
return ctx.clipboard.get();
}