AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

experimental/editor/application: pre-shape text before showing window

Browse Source 
Also, make constructor do even less work.

Change-Id: Iced41488757d6d5d01c4e1d02eee03ab2bb109a4
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/234216
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
Auto-Submit: Hal Canary <halcanary@google.com>
This commit is contained in:
Hal Canary 2019-08-12 14:23:51 -04:00 committed by Skia Commit-Bot
parent 6e1b7bb2b5
commit 5fd38c0959
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
experimental/editor/editor_application.cpp
View File

@ -343,12 +343,10 @@ struct EditorApplication : public sk_app::Application {
EditorLayer fLayer;
double fNextTime = -DBL_MAX;
EditorApplication(void* platformData)
: fWindow(sk_app::Window::CreateNativeWindow(platformData)) {}
EditorApplication(std::unique_ptr<sk_app::Window> win) : fWindow(std::move(win)) {}
bool init(const char* path) {
fWindow->attach(kBackendType);
fLayer.inval();
fLayer.fEditor.setFont(SkFont(SkTypeface::MakeFromName(kTypefaceName,
SkFontStyle(kFontWeight, kFontWidth, kFontSlant)), kFontSize));
@ -356,8 +354,10 @@ struct EditorApplication : public sk_app::Application {
fWindow->pushLayer(&fLayer);
fWindow->setTitle(SkStringPrintf("Editor: \"%s\"", fLayer.fPath.c_str()).c_str());
fWindow->show();
fLayer.onResize(fWindow->width(), fWindow->height());
fLayer.fEditor.paint(nullptr, editor::Editor::PaintOpts());
fWindow->show();
return true;
}
~EditorApplication() override { fWindow->detach(); }
@ -378,7 +378,11 @@ sk_app::Application* sk_app::Application::Create(int argc, char** argv, void* da
if (!SkLoadICU()) {
SK_ABORT("SkLoadICU failed.");
}
EditorApplication* app = new EditorApplication(dat);
SkASSERT(app->init(argc > 1 ? argv[1] : nullptr));
return app;
std::unique_ptr<sk_app::Window> win(sk_app::Window::CreateNativeWindow(dat));
if (!win) {
SK_ABORT("CreateNativeWindow failed.");
}
std::unique_ptr<EditorApplication> app(new EditorApplication(std::move(win)));
(void)app->init(argc > 1 ? argv[1] : nullptr);
return app.release();
}