mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-14 04:19:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Convert m_confPopup to unique_ptr

Browse Source
This commit is contained in:
David Capello 2021-05-28 15:08:17 -03:00
parent e5925ffb15
commit 8b5cdde07c
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/ui/timeline/timeline.cpp
View File

@ -250,7 +250,7 @@ Timeline::Timeline(TooltipManager* tooltipManager)
, m_separator_x(
Preferences::instance().general.timelineLayerPanelWidth() * guiscale())
, m_separator_w(1)
, m_confPopup(NULL)
, m_confPopup(nullptr)
, m_clipboard_timer(100, this)
, m_offset_count(0)
, m_redrawMarchingAntsOnly(false)
@ -285,7 +285,7 @@ Timeline::~Timeline()
detachDocument();
m_context->documents().remove_observer(this);
m_context->remove_observer(this);
delete m_confPopup;
m_confPopup.reset();
}
void Timeline::setZoom(const double zoom)
@ -1239,17 +1239,14 @@ bool Timeline::onProcessMessage(Message* msg)
getPartBounds(Hit(PART_HEADER_GEAR)).offset(bounds().origin());
if (!m_confPopup) {
ConfigureTimelinePopup* popup =
new ConfigureTimelinePopup();
popup->remapWindow();
m_confPopup = popup;
m_confPopup.reset(new ConfigureTimelinePopup);
m_confPopup->remapWindow();
}
if (!m_confPopup->isVisible()) {
gfx::Rect bounds = m_confPopup->bounds();
ui::fit_bounds(display(), BOTTOM, gearBounds, bounds);
ui::fit_bounds(display(), m_confPopup, bounds);
ui::fit_bounds(display(), m_confPopup.get(), bounds);
m_confPopup->openWindow();
}
else {

3
src/app/ui/timeline/timeline.h
View File

@ -32,6 +32,7 @@
#include "ui/timer.h"
#include "ui/widget.h"
#include <memory>
#include <vector>
namespace doc {
@ -408,7 +409,7 @@ namespace app {
// Absolute mouse positions for scrolling.
gfx::Point m_oldPos;
// Configure timeline
ConfigureTimelinePopup* m_confPopup;
std::unique_ptr<ConfigureTimelinePopup> m_confPopup;
obs::scoped_connection m_ctxConn;
obs::connection m_firstFrameConn;