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

Rename PreferredSize -> SizeHint

Browse Source
This commit is contained in:
David Capello 2015-12-03 21:50:05 -03:00
parent 78ba213471
commit cdd955441a
107 changed files with 367 additions and 368 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/commands/cmd_export_sprite_sheet.cpp
View File

@ -633,7 +633,7 @@ private:
}
void resize() {
gfx::Size reqSize = getPreferredSize();
gfx::Size reqSize = sizeHint();
moveWindow(gfx::Rect(getOrigin(), reqSize));
layout();
invalidate();

6
src/app/commands/cmd_keyboard_shortcuts.cpp
View File

@ -30,7 +30,7 @@
#include "ui/graphics.h"
#include "ui/listitem.h"
#include "ui/paint_event.h"
#include "ui/preferred_size_event.h"
#include "ui/size_hint_event.h"
#include "ui/resize_event.h"
#include "ui/separator.h"
@ -121,7 +121,7 @@ private:
getRoot()->layout();
}
void onPreferredSize(PreferredSizeEvent& ev) override {
void onSizeHint(SizeHintEvent& ev) override {
gfx::Size size = getTextSize();
size.w = size.w + border().width();
size.h = size.h + border().height() + 4*guiscale();
@ -132,7 +132,7 @@ private:
size.h *= combos;
}
ev.setPreferredSize(size);
ev.setSizeHint(size);
}
void onPaint(PaintEvent& ev) override {

8
src/app/commands/filters/color_curve_editor.cpp
View File

@ -17,7 +17,7 @@
#include "ui/manager.h"
#include "ui/message.h"
#include "ui/paint_event.h"
#include "ui/preferred_size_event.h"
#include "ui/size_hint_event.h"
#include "ui/system.h"
#include "ui/theme.h"
#include "ui/view.h"
@ -177,10 +177,10 @@ bool ColorCurveEditor::onProcessMessage(Message* msg)
return Widget::onProcessMessage(msg);
}
void ColorCurveEditor::onPreferredSize(PreferredSizeEvent& ev)
void ColorCurveEditor::onSizeHint(SizeHintEvent& ev)
{
ev.setPreferredSize(gfx::Size(1 + border().width(),
1 + border().height()));
ev.setSizeHint(gfx::Size(1 + border().width(),
1 + border().height()));
}
void ColorCurveEditor::onPaint(ui::PaintEvent& ev)

2
src/app/commands/filters/color_curve_editor.h
View File

@ -30,7 +30,7 @@ namespace app {
protected:
bool onProcessMessage(ui::Message* msg) override;
void onPreferredSize(ui::PreferredSizeEvent& ev) override;
void onSizeHint(ui::SizeHintEvent& ev) override;
void onPaint(ui::PaintEvent& ev) override;
private:

6
src/app/ui/app_menuitem.cpp
View File

@ -19,7 +19,7 @@
#include "ui/accelerator.h"
#include "ui/menu.h"
#include "ui/message.h"
#include "ui/preferred_size_event.h"
#include "ui/size_hint_event.h"
#include "ui/widget.h"
#include <cstdarg>
@ -85,7 +85,7 @@ bool AppMenuItem::onProcessMessage(Message* msg)
return MenuItem::onProcessMessage(msg);
}
void AppMenuItem::onPreferredSize(PreferredSizeEvent& ev)
void AppMenuItem::onSizeHint(SizeHintEvent& ev)
{
gfx::Size size(0, 0);
@ -105,7 +105,7 @@ void AppMenuItem::onPreferredSize(PreferredSizeEvent& ev)
}
}
ev.setPreferredSize(size);
ev.setSizeHint(size);
}
void AppMenuItem::onClick()

2
src/app/ui/app_menuitem.h
View File

@ -35,7 +35,7 @@ namespace app {
protected:
bool onProcessMessage(ui::Message* msg) override;
void onPreferredSize(ui::PreferredSizeEvent& ev) override;
void onSizeHint(ui::SizeHintEvent& ev) override;
void onClick() override;
private:

6
src/app/ui/button_set.cpp
View File

@ -21,7 +21,7 @@
#include "ui/graphics.h"
#include "ui/message.h"
#include "ui/paint_event.h"
#include "ui/preferred_size_event.h"
#include "ui/size_hint_event.h"
#include "ui/system.h"
#include "ui/theme.h"
#include "ui/widget.h"
@ -206,7 +206,7 @@ bool ButtonSet::Item::onProcessMessage(ui::Message* msg)
return Widget::onProcessMessage(msg);
}
void ButtonSet::Item::onPreferredSize(ui::PreferredSizeEvent& ev)
void ButtonSet::Item::onSizeHint(ui::SizeHintEvent& ev)
{
gfx::Size iconSize;
if (m_icon) {
@ -229,7 +229,7 @@ void ButtonSet::Item::onPreferredSize(ui::PreferredSizeEvent& ev)
if (info.row == info.grid_rows-1)
sz.h += 3*guiscale();
ev.setPreferredSize(sz);
ev.setSizeHint(sz);
}
ButtonSet::ButtonSet(int columns)

2
src/app/ui/button_set.h
View File

@ -28,7 +28,7 @@ namespace app {
protected:
void onPaint(ui::PaintEvent& ev) override;
bool onProcessMessage(ui::Message* msg) override;
void onPreferredSize(ui::PreferredSizeEvent& ev) override;
void onSizeHint(ui::SizeHintEvent& ev) override;
private:
skin::SkinPartPtr m_icon;
};

4
src/app/ui/color_bar.cpp
View File

@ -155,8 +155,8 @@ ColorBar::ColorBar(int align)
setChildSpacing(2*guiscale());
m_paletteView.setColumns(8);
m_fgColor.setPreferredSize(0, m_fgColor.getPreferredSize().h);
m_bgColor.setPreferredSize(0, m_bgColor.getPreferredSize().h);
m_fgColor.setSizeHint(0, m_fgColor.sizeHint().h);
m_bgColor.setSizeHint(0, m_bgColor.sizeHint().h);
// TODO hardcoded scroll bar width should be get from skin.xml file
int scrollBarWidth = 6*guiscale();

8
src/app/ui/color_button.cpp
View File

@ -26,7 +26,7 @@
#include "doc/layer.h"
#include "doc/site.h"
#include "doc/sprite.h"
#include "ui/preferred_size_event.h"
#include "ui/size_hint_event.h"
#include "ui/ui.h"
namespace app {
@ -158,14 +158,14 @@ bool ColorButton::onProcessMessage(Message* msg)
return ButtonBase::onProcessMessage(msg);
}
void ColorButton::onPreferredSize(PreferredSizeEvent& ev)
void ColorButton::onSizeHint(SizeHintEvent& ev)
{
gfx::Rect box;
getTextIconInfo(&box);
box.w = 64*guiscale();
ev.setPreferredSize(box.w + border().width(),
box.h + border().height());
ev.setSizeHint(box.w + border().width(),
box.h + border().height());
}
void ColorButton::onPaint(PaintEvent& ev)

2
src/app/ui/color_button.h
View File

@ -36,7 +36,7 @@ namespace app {
protected:
// Events
bool onProcessMessage(ui::Message* msg) override;
void onPreferredSize(ui::PreferredSizeEvent& ev) override;
void onSizeHint(ui::SizeHintEvent& ev) override;
void onPaint(ui::PaintEvent& ev) override;
void onClick(ui::Event& ev) override;

2
src/app/ui/color_selector.cpp
View File

@ -97,7 +97,7 @@ ColorSelector::ColorSelector()
m_hexColorEntry.ColorChange.connect(&ColorSelector::onColorHexEntryChange, this);
selectColorType(app::Color::RgbType);
setPreferredSize(gfx::Size(300*guiscale(), getPreferredSize().h));
setSizeHint(gfx::Size(300*guiscale(), sizeHint().h));
m_onPaletteChangeConn =
App::instance()->PaletteChange.connect(&ColorSelector::onPaletteChange, this);

6
src/app/ui/color_sliders.cpp
View File

@ -18,7 +18,7 @@
#include "ui/entry.h"
#include "ui/graphics.h"
#include "ui/label.h"
#include "ui/preferred_size_event.h"
#include "ui/size_hint_event.h"
#include "ui/slider.h"
#include "ui/theme.h"
@ -124,9 +124,9 @@ void ColorSliders::resetRelativeSliders()
slider->setValue(0);
}
void ColorSliders::onPreferredSize(PreferredSizeEvent& ev)
void ColorSliders::onSizeHint(SizeHintEvent& ev)
{
ev.setPreferredSize(m_grid.getPreferredSize());
ev.setSizeHint(m_grid.sizeHint());
}
void ColorSliders::addSlider(Channel channel, const char* labelText, int min, int max)

2
src/app/ui/color_sliders.h
View File

@ -46,7 +46,7 @@ namespace app {
Signal1<void, ColorSlidersChangeEvent&> ColorChange;
protected:
void onPreferredSize(ui::PreferredSizeEvent& ev);
void onSizeHint(ui::SizeHintEvent& ev);
// For derived classes
void addSlider(Channel channel, const char* labelText, int min, int max);

6
src/app/ui/color_spectrum.cpp
View File

@ -18,7 +18,7 @@
#include "ui/graphics.h"
#include "ui/message.h"
#include "ui/paint_event.h"
#include "ui/preferred_size_event.h"
#include "ui/size_hint_event.h"
#include "ui/resize_event.h"
#include "ui/system.h"
@ -76,9 +76,9 @@ void ColorSpectrum::selectColor(const app::Color& color)
invalidate();
}
void ColorSpectrum::onPreferredSize(PreferredSizeEvent& ev)
void ColorSpectrum::onSizeHint(SizeHintEvent& ev)
{
ev.setPreferredSize(gfx::Size(32*ui::guiscale(), 32*ui::guiscale()));
ev.setSizeHint(gfx::Size(32*ui::guiscale(), 32*ui::guiscale()));
}
void ColorSpectrum::onResize(ui::ResizeEvent& ev)

2
src/app/ui/color_spectrum.h
View File

@ -28,7 +28,7 @@ namespace app {
Signal2<void, const app::Color&, ui::MouseButtons> ColorChange;
protected:
void onPreferredSize(ui::PreferredSizeEvent& ev) override;
void onSizeHint(ui::SizeHintEvent& ev) override;
void onResize(ui::ResizeEvent& ev) override;
void onPaint(ui::PaintEvent& ev) override;
bool onProcessMessage(ui::Message* msg) override;

8
src/app/ui/color_wheel.cpp
View File

@ -24,7 +24,7 @@
#include "ui/menu.h"
#include "ui/message.h"
#include "ui/paint_event.h"
#include "ui/preferred_size_event.h"
#include "ui/size_hint_event.h"
#include "ui/resize_event.h"
#include "ui/system.h"
@ -178,9 +178,9 @@ app::Color ColorWheel::getColorInHarmony(int j) const
m_mainColor.getValue());
}
void ColorWheel::onPreferredSize(PreferredSizeEvent& ev)
void ColorWheel::onSizeHint(SizeHintEvent& ev)
{
ev.setPreferredSize(gfx::Size(32*ui::guiscale(), 32*ui::guiscale()));
ev.setSizeHint(gfx::Size(32*ui::guiscale(), 32*ui::guiscale()));
}
void ColorWheel::onResize(ui::ResizeEvent& ev)
@ -196,7 +196,7 @@ void ColorWheel::onResize(ui::ResizeEvent& ev)
rc.y+rc.h/2-r,
r*2, r*2);
gfx::Size prefSize = m_options.getPreferredSize();
gfx::Size prefSize = m_options.sizeHint();
rc = getChildrenBounds();
rc.x += rc.w-prefSize.w;
rc.w = prefSize.w;

2
src/app/ui/color_wheel.h
View File

@ -46,7 +46,7 @@ namespace app {
Signal2<void, const app::Color&, ui::MouseButtons> ColorChange;
private:
void onPreferredSize(ui::PreferredSizeEvent& ev) override;
void onSizeHint(ui::SizeHintEvent& ev) override;
void onResize(ui::ResizeEvent& ev) override;
void onPaint(ui::PaintEvent& ev) override;
bool onProcessMessage(ui::Message* msg) override;

20
src/app/ui/context_bar.cpp
View File

@ -57,7 +57,7 @@
#include "ui/message.h"
#include "ui/paint_event.h"
#include "ui/popup_window.h"
#include "ui/preferred_size_event.h"
#include "ui/size_hint_event.h"
#include "ui/system.h"
#include "ui/theme.h"
#include "ui/tooltips.h"
@ -113,8 +113,8 @@ protected:
closePopup();
}
void onPreferredSize(PreferredSizeEvent& ev) override {
ev.setPreferredSize(Size(16, 18)*guiscale());
void onSizeHint(SizeHintEvent& ev) override {
ev.setSizeHint(Size(16, 18)*guiscale());
}
// BrushPopupDelegate impl
@ -144,7 +144,7 @@ private:
gfx::Rect getPopupBox() {
Rect rc = getBounds();
rc.y += rc.h - 2*guiscale();
rc.setSize(getPreferredSize());
rc.setSize(sizeHint());
return rc;
}
@ -574,14 +574,14 @@ class ContextBar::InkShadesField : public HBox {
return Widget::onProcessMessage(msg);
}
void onPreferredSize(PreferredSizeEvent& ev) override {
void onSizeHint(SizeHintEvent& ev) override {
int size = this->size();
if (size < 2)
ev.setPreferredSize(Size((16+m_boxSize)*guiscale()+getTextWidth(), 18*guiscale()));
ev.setSizeHint(Size((16+m_boxSize)*guiscale()+getTextWidth(), 18*guiscale()));
else {
if (m_click == Select && size > 16)
size = 16;
ev.setPreferredSize(Size(6+m_boxSize*size, 18)*guiscale());
ev.setSizeHint(Size(6+m_boxSize*size, 18)*guiscale());
}
}
@ -866,7 +866,7 @@ public:
addChild(&m_maskColor);
m_icon.addItem(theme->parts.selectionOpaque());
gfx::Size sz = m_icon.getItem(0)->getPreferredSize();
gfx::Size sz = m_icon.getItem(0)->sizeHint();
sz.w += 2*guiscale();
m_icon.getItem(0)->setMinSize(sz);
@ -1371,9 +1371,9 @@ ContextBar::ContextBar()
setActiveBrush(createBrushFromPreferences());
}
void ContextBar::onPreferredSize(PreferredSizeEvent& ev)
void ContextBar::onSizeHint(SizeHintEvent& ev)
{
ev.setPreferredSize(gfx::Size(0, 18*guiscale())); // TODO calculate height
ev.setSizeHint(gfx::Size(0, 18*guiscale())); // TODO calculate height
}
void ContextBar::onToolSetOpacity(const int& newOpacity)

2
src/app/ui/context_bar.h
View File

@ -80,7 +80,7 @@ namespace app {
Signal0<void> BrushChange;
protected:
void onPreferredSize(ui::PreferredSizeEvent& ev) override;
void onSizeHint(ui::SizeHintEvent& ev) override;
void onToolSetOpacity(const int& newOpacity);
void onToolSetFreehandAlgorithm();

12
src/app/ui/data_recovery_view.cpp
View File

@ -24,7 +24,7 @@
#include "ui/entry.h"
#include "ui/listitem.h"
#include "ui/message.h"
#include "ui/preferred_size_event.h"
#include "ui/size_hint_event.h"
#include "ui/resize_event.h"
#include "ui/system.h"
#include "ui/view.h"
@ -58,19 +58,19 @@ public:
Signal0<void> Regenerate;
protected:
void onPreferredSize(PreferredSizeEvent& ev) override {
gfx::Size sz = m_deleteButton.getPreferredSize();
void onSizeHint(SizeHintEvent& ev) override {
gfx::Size sz = m_deleteButton.sizeHint();
sz.h += 4*guiscale();
ev.setPreferredSize(sz);
ev.setSizeHint(sz);
}
void onResize(ResizeEvent& ev) override {
ListItem::onResize(ev);
gfx::Rect rc = ev.getBounds();
gfx::Size sz1 = m_openButton.getPreferredSize();
gfx::Size sz1 = m_openButton.sizeHint();
sz1.w *= 2*guiscale();
gfx::Size sz2 = m_deleteButton.getPreferredSize();
gfx::Size sz2 = m_deleteButton.sizeHint();
int h = rc.h*3/4;
int sep = 8*guiscale();
m_openButton.setBounds(gfx::Rect(rc.x+rc.w-sz2.w-sz1.w-2*sep, rc.y+rc.h/2-h/2, sz1.w, h));

4
src/app/ui/editor/editor.cpp
View File

@ -1324,7 +1324,7 @@ bool Editor::onProcessMessage(Message* msg)
return Widget::onProcessMessage(msg);
}
void Editor::onPreferredSize(PreferredSizeEvent& ev)
void Editor::onSizeHint(SizeHintEvent& ev)
{
gfx::Size sz(0, 0);
@ -1337,7 +1337,7 @@ void Editor::onPreferredSize(PreferredSizeEvent& ev)
sz.w = 4;
sz.h = 4;
}
ev.setPreferredSize(sz);
ev.setSizeHint(sz);
}
void Editor::onResize(ui::ResizeEvent& ev)

2
src/app/ui/editor/editor.h
View File

@ -218,7 +218,7 @@ namespace app {
protected:
bool onProcessMessage(ui::Message* msg) override;
void onPreferredSize(ui::PreferredSizeEvent& ev) override;
void onSizeHint(ui::SizeHintEvent& ev) override;
void onResize(ui::ResizeEvent& ev) override;
void onPaint(ui::PaintEvent& ev) override;
void onInvalidateRegion(const gfx::Region& region) override;

4
src/app/ui/file_list.cpp
View File

@ -397,7 +397,7 @@ void FileList::onPaint(ui::PaintEvent& ev)
}
}
void FileList::onPreferredSize(PreferredSizeEvent& ev)
void FileList::onSizeHint(SizeHintEvent& ev)
{
if (!m_req_valid) {
gfx::Size reqSize(0, 0);
@ -416,7 +416,7 @@ void FileList::onPreferredSize(PreferredSizeEvent& ev)
m_req_w = reqSize.w;
m_req_h = reqSize.h;
}
ev.setPreferredSize(Size(m_req_w, m_req_h));
ev.setSizeHint(Size(m_req_w, m_req_h));
}
void FileList::onFileSelected()

2
src/app/ui/file_list.h
View File

@ -41,7 +41,7 @@ namespace app {
protected:
virtual bool onProcessMessage(ui::Message* msg) override;
virtual void onPaint(ui::PaintEvent& ev) override;
virtual void onPreferredSize(ui::PreferredSizeEvent& ev) override;
virtual void onSizeHint(ui::SizeHintEvent& ev) override;
virtual void onFileSelected();
virtual void onFileAccepted();
virtual void onCurrentFolderChanged();

10
src/app/ui/font_popup.cpp
View File

@ -29,7 +29,7 @@
#include "she/system.h"
#include "ui/box.h"
#include "ui/button.h"
#include "ui/preferred_size_event.h"
#include "ui/size_hint_event.h"
#include "ui/theme.h"
#include "ui/view.h"
@ -79,11 +79,11 @@ private:
}
}
void onPreferredSize(PreferredSizeEvent& ev) override {
ListItem::onPreferredSize(ev);
void onSizeHint(SizeHintEvent& ev) override {
ListItem::onSizeHint(ev);
if (m_image) {
gfx::Size sz = ev.getPreferredSize();
ev.setPreferredSize(
gfx::Size sz = ev.sizeHint();
ev.setSizeHint(
sz.w + 4 + m_image->width(),
MAX(sz.h, m_image->height()));
}

2
src/app/ui/home_view.cpp
View File

@ -157,7 +157,7 @@ void HomeView::onNewUpdate(const std::string& url, const std::string& version)
SkinStylePropertyPtr(new SkinStyleProperty(theme->styles.workspaceUpdateLink())));
// TODO this should be in a skin.xml's <style>
gfx::Size iconSize = theme->styles.workspaceUpdateLink()->preferredSize(
gfx::Size iconSize = theme->styles.workspaceUpdateLink()->sizeHint(
nullptr, Style::State());
checkUpdate()->setBorder(gfx::Border(6*guiscale())+gfx::Border(
0, 0, iconSize.w, 0));

6
src/app/ui/icon_button.cpp
View File

@ -15,7 +15,7 @@
#include "she/surface.h"
#include "ui/message.h"
#include "ui/paint_event.h"
#include "ui/preferred_size_event.h"
#include "ui/size_hint_event.h"
#include "ui/system.h"
namespace app {
@ -30,9 +30,9 @@ IconButton::IconButton(she::Surface* icon)
setBgColor(SkinTheme::instance()->colors.menuitemNormalFace());
}
void IconButton::onPreferredSize(PreferredSizeEvent& ev)
void IconButton::onSizeHint(SizeHintEvent& ev)
{
ev.setPreferredSize(
ev.setSizeHint(
gfx::Size(m_icon->width(),
m_icon->height()) + 4*guiscale());
}

2
src/app/ui/icon_button.h
View File

@ -19,7 +19,7 @@ namespace app {
protected:
// bool onProcessMessage(ui::Message* msg) override;
void onPreferredSize(ui::PreferredSizeEvent& ev) override;
void onSizeHint(ui::SizeHintEvent& ev) override;
void onPaint(ui::PaintEvent& ev) override;
private:

2
src/app/ui/main_window.cpp
View File

@ -93,7 +93,7 @@ MainWindow::MainWindow()
timelinePlaceholder()->addChild(m_timeline);
// Default splitter positions
colorBarSplitter()->setPosition(m_colorBar->getPreferredSize().w);
colorBarSplitter()->setPosition(m_colorBar->sizeHint().w);
timelineSplitter()->setPosition(75);
// Prepare the window

14
src/app/ui/news_listbox.cpp
View File

@ -22,7 +22,7 @@
#include "base/time.h"
#include "ui/link_label.h"
#include "ui/paint_event.h"
#include "ui/preferred_size_event.h"
#include "ui/size_hint_event.h"
#include "ui/view.h"
#include "tinyxml.h"
@ -126,22 +126,22 @@ public:
}
protected:
void onPreferredSize(PreferredSizeEvent& ev) override {
void onSizeHint(SizeHintEvent& ev) override {
SkinTheme* theme = static_cast<SkinTheme*>(getTheme());
Style* style = theme->styles.newsItem();
Style* styleDetail = theme->styles.newsItemDetail();
Style::State state;
gfx::Size sz1 = style->preferredSize(getText().c_str(), state);
gfx::Size sz1 = style->sizeHint(getText().c_str(), state);
gfx::Size sz2, sz2fourlines;
if (!m_desc.empty()) {
View* view = View::getView(getParent());
sz2 = styleDetail->preferredSize(m_desc.c_str(), state,
sz2 = styleDetail->sizeHint(m_desc.c_str(), state,
(view ? view->getViewportBounds().w: 0));
sz2fourlines = styleDetail->preferredSize("\n\n\n", state);
sz2fourlines = styleDetail->sizeHint("\n\n\n", state);
}
ev.setPreferredSize(gfx::Size(0, MIN(sz1.h+sz2fourlines.h, sz1.h+sz2.h)));
ev.setSizeHint(gfx::Size(0, MIN(sz1.h+sz2fourlines.h, sz1.h+sz2.h)));
}
void onPaint(PaintEvent& ev) override {
@ -156,7 +156,7 @@ protected:
if (isSelected()) state += Style::active();
if (getParent()->hasCapture()) state += Style::clicked();
gfx::Size textSize = style->preferredSize(getText().c_str(), state);
gfx::Size textSize = style->sizeHint(getText().c_str(), state);
gfx::Rect textBounds(bounds.x, bounds.y, bounds.w, textSize.h);
gfx::Rect detailsBounds(
bounds.x, bounds.y+textSize.h,

8
src/app/ui/notifications.cpp
View File

@ -17,7 +17,7 @@
#include "base/launcher.h"
#include "ui/menu.h"
#include "ui/paint_event.h"
#include "ui/preferred_size_event.h"
#include "ui/size_hint_event.h"
namespace app {
@ -53,9 +53,9 @@ void Notifications::addLink(INotificationDelegate* del)
m_withNotifications = true;
}
void Notifications::onPreferredSize(PreferredSizeEvent& ev)
void Notifications::onSizeHint(SizeHintEvent& ev)
{
ev.setPreferredSize(gfx::Size(16, 10)*guiscale()); // TODO hard-coded flag size
ev.setSizeHint(gfx::Size(16, 10)*guiscale()); // TODO hard-coded flag size
}
void Notifications::onPaint(PaintEvent& ev)
@ -76,7 +76,7 @@ void Notifications::onClick(ui::Event& ev)
gfx::Rect bounds = getBounds();
m_popup.showPopup(gfx::Point(
bounds.x - m_popup.getPreferredSize().w,
bounds.x - m_popup.sizeHint().w,
bounds.y + bounds.h));
}

2
src/app/ui/notifications.h
View File

@ -26,7 +26,7 @@ namespace app {
void addLink(INotificationDelegate* del);
protected:
void onPreferredSize(ui::PreferredSizeEvent& ev) override;
void onSizeHint(ui::SizeHintEvent& ev) override;
void onPaint(ui::PaintEvent& ev) override;
void onClick(ui::Event& ev) override;

6
src/app/ui/palette_view.cpp
View File

@ -35,7 +35,7 @@
#include "ui/manager.h"
#include "ui/message.h"
#include "ui/paint_event.h"
#include "ui/preferred_size_event.h"
#include "ui/size_hint_event.h"
#include "ui/system.h"
#include "ui/theme.h"
#include "ui/view.h"
@ -599,7 +599,7 @@ void PaletteView::onResize(ui::ResizeEvent& ev)
Widget::onResize(ev);
}
void PaletteView::onPreferredSize(ui::PreferredSizeEvent& ev)
void PaletteView::onSizeHint(ui::SizeHintEvent& ev)
{
div_t d = div(currentPalette()->size(), m_columns);
int cols = m_columns;
@ -613,7 +613,7 @@ void PaletteView::onPreferredSize(ui::PreferredSizeEvent& ev)
sz.w = border().width() + cols*m_boxsize + (cols-1)*childSpacing();
sz.h = border().height() + rows*m_boxsize + (rows-1)*childSpacing();
ev.setPreferredSize(sz);
ev.setSizeHint(sz);
}
void PaletteView::onDrawMarchingAnts()

2
src/app/ui/palette_view.h
View File

@ -85,7 +85,7 @@ namespace app {
bool onProcessMessage(ui::Message* msg) override;
void onPaint(ui::PaintEvent& ev) override;
void onResize(ui::ResizeEvent& ev) override;
void onPreferredSize(ui::PreferredSizeEvent& ev) override;
void onSizeHint(ui::SizeHintEvent& ev) override;
void onDrawMarchingAnts() override;
private:

4
src/app/ui/palettes_listbox.cpp
View File

@ -21,7 +21,7 @@
#include "ui/listitem.h"
#include "ui/message.h"
#include "ui/paint_event.h"
#include "ui/preferred_size_event.h"
#include "ui/size_hint_event.h"
#include "ui/view.h"
namespace app {
@ -75,7 +75,7 @@ void PalettesListBox::onPaintResource(Graphics* g, const gfx::Rect& bounds, Reso
// bounds.y + bounds.h/2 - g->measureUIString(getText()).h/2));
}
void PalettesListBox::onResourcePreferredSize(Resource* resource, gfx::Size& size)
void PalettesListBox::onResourceSizeHint(Resource* resource, gfx::Size& size)
{
size = gfx::Size(0, (2+16+2)*guiscale());
}

2
src/app/ui/palettes_listbox.h
View File

@ -28,7 +28,7 @@ namespace app {
protected:
virtual void onResourceChange(Resource* resource) override;
virtual void onPaintResource(ui::Graphics* g, const gfx::Rect& bounds, Resource* resource) override;
virtual void onResourcePreferredSize(Resource* resource, gfx::Size& size) override;
virtual void onResourceSizeHint(Resource* resource, gfx::Size& size) override;
};
} // namespace app

12
src/app/ui/recent_listbox.cpp
View File

@ -25,7 +25,7 @@
#include "ui/listitem.h"
#include "ui/message.h"
#include "ui/paint_event.h"
#include "ui/preferred_size_event.h"
#include "ui/size_hint_event.h"
#include "ui/system.h"
#include "ui/view.h"
@ -44,14 +44,14 @@ public:
}
protected:
void onPreferredSize(PreferredSizeEvent& ev) override {
void onSizeHint(SizeHintEvent& ev) override {
SkinTheme* theme = static_cast<SkinTheme*>(getTheme());
Style* style = theme->styles.recentFile();
Style* styleDetail = theme->styles.recentFileDetail();
Style::State state;
gfx::Size sz1 = style->preferredSize(name().c_str(), state);
gfx::Size sz2 = styleDetail->preferredSize(path().c_str(), state);
ev.setPreferredSize(gfx::Size(sz1.w+sz2.w, MAX(sz1.h, sz2.h)));
gfx::Size sz1 = style->sizeHint(name().c_str(), state);
gfx::Size sz2 = styleDetail->sizeHint(path().c_str(), state);
ev.setSizeHint(gfx::Size(sz1.w+sz2.w, MAX(sz1.h, sz2.h)));
}
void onPaint(PaintEvent& ev) override {
@ -69,7 +69,7 @@ protected:
std::string name = this->name();
style->paint(g, bounds, name.c_str(), state);
gfx::Size textSize = style->preferredSize(name.c_str(), state);
gfx::Size textSize = style->sizeHint(name.c_str(), state);
gfx::Rect detailsBounds(
bounds.x+textSize.w, bounds.y,
bounds.w-textSize.w, bounds.h);

12
src/app/ui/resources_listbox.cpp
View File

@ -19,7 +19,7 @@
#include "ui/listitem.h"
#include "ui/message.h"
#include "ui/paint_event.h"
#include "ui/preferred_size_event.h"
#include "ui/size_hint_event.h"
#include "ui/view.h"
namespace app {
@ -85,10 +85,10 @@ protected:
bounds.y + bounds.h/2 - g->measureUIString(getText()).h/2));
}
void onPreferredSize(PreferredSizeEvent& ev) override {
ev.setPreferredSize(
void onSizeHint(SizeHintEvent& ev) override {
ev.setSizeHint(
static_cast<ResourcesListBox*>(getParent())->
preferredResourceSize(m_resource));
resourceSizeHint(m_resource));
}
private:
@ -140,10 +140,10 @@ void ResourcesListBox::paintResource(Graphics* g, const gfx::Rect& bounds, Resou
onPaintResource(g, bounds, resource);
}
gfx::Size ResourcesListBox::preferredResourceSize(Resource* resource)
gfx::Size ResourcesListBox::resourceSizeHint(Resource* resource)
{
gfx::Size pref(0, 0);
onResourcePreferredSize(resource, pref);
onResourceSizeHint(resource, pref);
return pref;
}

4
src/app/ui/resources_listbox.h
View File

@ -23,7 +23,7 @@ namespace app {
Resource* selectedResource();
void paintResource(ui::Graphics* g, const gfx::Rect& bounds, Resource* resource);
gfx::Size preferredResourceSize(Resource* resource);
gfx::Size resourceSizeHint(Resource* resource);
protected:
virtual bool onProcessMessage(ui::Message* msg) override;
@ -32,7 +32,7 @@ namespace app {
// abstract
virtual void onPaintResource(ui::Graphics* g, const gfx::Rect& bounds, Resource* resource) = 0;
virtual void onResourcePreferredSize(Resource* resource, gfx::Size& size) = 0;
virtual void onResourceSizeHint(Resource* resource, gfx::Size& size) = 0;
private:
void onTick();

10
src/app/ui/search_entry.cpp
View File

@ -16,7 +16,7 @@
#include "ui/graphics.h"
#include "ui/message.h"
#include "ui/paint_event.h"
#include "ui/preferred_size_event.h"
#include "ui/size_hint_event.h"
namespace app {
@ -69,16 +69,16 @@ void SearchEntry::onPaint(ui::PaintEvent& ev)
}
}
void SearchEntry::onPreferredSize(PreferredSizeEvent& ev)
void SearchEntry::onSizeHint(SizeHintEvent& ev)
{
Entry::onPreferredSize(ev);
Size sz = ev.getPreferredSize();
Entry::onSizeHint(ev);
Size sz = ev.sizeHint();
SkinTheme* theme = static_cast<SkinTheme*>(getTheme());
auto icon = theme->parts.iconSearch()->getBitmap(0);
sz.h = MAX(sz.h, icon->height()+border().height());
ev.setPreferredSize(sz);
ev.setSizeHint(sz);
}
Rect SearchEntry::onGetEntryTextBounds() const

2
src/app/ui/search_entry.h
View File

@ -20,7 +20,7 @@ namespace app {
private:
bool onProcessMessage(ui::Message* msg) override;
void onPaint(ui::PaintEvent& ev) override;
void onPreferredSize(ui::PreferredSizeEvent& ev) override;
void onSizeHint(ui::SizeHintEvent& ev) override;
gfx::Rect onGetEntryTextBounds() const override;
gfx::Rect getCloseIconBounds() const;

6
src/app/ui/skin/style.cpp
View File

@ -186,7 +186,7 @@ void Rules::paint(ui::Graphics* g,
if (m_text) m_text->paint(g, bounds, text);
}
gfx::Size Rules::preferredSize(const char* text, int maxWidth)
gfx::Size Rules::sizeHint(const char* text, int maxWidth)
{
gfx::Size sz(0, 0);
if (m_icon) {
@ -244,12 +244,12 @@ void Style::paint(ui::Graphics* g,
getRulesFromState(state)->paint(g, bounds, text);
}
gfx::Size Style::preferredSize(
gfx::Size Style::sizeHint(
const char* text,
const State& state,
int maxWidth)
{
return getRulesFromState(state)->preferredSize(text, maxWidth);
return getRulesFromState(state)->sizeHint(text, maxWidth);
}
} // namespace skin

4
src/app/ui/skin/style.h
View File

@ -111,7 +111,7 @@ namespace app {
const gfx::Rect& bounds,
const char* text);
gfx::Size preferredSize(const char* text, int maxWidth);
gfx::Size sizeHint(const char* text, int maxWidth);
private:
BackgroundRule* m_background;
@ -137,7 +137,7 @@ namespace app {
const char* text,
const State& state);
gfx::Size preferredSize(
gfx::Size sizeHint(
const char* text,
const State& state,
int maxWidth = 0);

10
src/app/ui/status_bar.cpp
View File

@ -366,7 +366,7 @@ void StatusBar::showSnapToGridWarning(bool state)
m_snapToGridWindow->remapWindow();
Rect rc = getBounds();
int toolBarWidth = ToolBar::instance()->getPreferredSize().w;
int toolBarWidth = ToolBar::instance()->sizeHint().w;
m_snapToGridWindow->positionWindow(
rc.x+rc.w-toolBarWidth-m_snapToGridWindow->getBounds().w,
@ -393,8 +393,8 @@ void StatusBar::onResize(ResizeEvent& ev)
Rect rc = ev.getBounds();
bool docControls = (rc.w > 300*ui::guiscale());
if (docControls) {
int prefWidth = m_docControls->getPreferredSize().w;
int toolBarWidth = ToolBar::instance()->getPreferredSize().w;
int prefWidth = m_docControls->sizeHint().w;
int toolBarWidth = ToolBar::instance()->sizeHint().w;
rc.x += rc.w - prefWidth - border.right() - toolBarWidth;
rc.w = prefWidth;
@ -406,10 +406,10 @@ void StatusBar::onResize(ResizeEvent& ev)
m_docControls->setVisible(false);
}
void StatusBar::onPreferredSize(PreferredSizeEvent& ev)
void StatusBar::onSizeHint(SizeHintEvent& ev)
{
int s = 4*guiscale() + getTextHeight() + 4*guiscale();
ev.setPreferredSize(Size(s, s));
ev.setSizeHint(Size(s, s));
}
void StatusBar::onPaint(ui::PaintEvent& ev)

2
src/app/ui/status_bar.h
View File

@ -66,7 +66,7 @@ namespace app {
protected:
void onResize(ui::ResizeEvent& ev) override;
void onPreferredSize(ui::PreferredSizeEvent& ev) override;
void onSizeHint(ui::SizeHintEvent& ev) override;
void onPaint(ui::PaintEvent& ev) override;
// ContextObserver impl

8
src/app/ui/styled_button.cpp
View File

@ -15,7 +15,7 @@
#include "app/ui/skin/style.h"
#include "ui/message.h"
#include "ui/paint_event.h"
#include "ui/preferred_size_event.h"
#include "ui/size_hint_event.h"
#include "ui/system.h"
namespace app {
@ -40,9 +40,9 @@ bool StyledButton::onProcessMessage(Message* msg) {
return Button::onProcessMessage(msg);
}
void StyledButton::onPreferredSize(PreferredSizeEvent& ev) {
ev.setPreferredSize(
m_style->preferredSize(NULL, skin::Style::State()) + 4*guiscale());
void StyledButton::onSizeHint(SizeHintEvent& ev) {
ev.setSizeHint(
m_style->sizeHint(NULL, skin::Style::State()) + 4*guiscale());
}
void StyledButton::onPaint(PaintEvent& ev) {

2
src/app/ui/styled_button.h
View File

@ -23,7 +23,7 @@ namespace app {
protected:
bool onProcessMessage(ui::Message* msg) override;
void onPreferredSize(ui::PreferredSizeEvent& ev) override;
void onSizeHint(ui::SizeHintEvent& ev) override;
void onPaint(ui::PaintEvent& ev) override;
private:

4
src/app/ui/tabs.cpp
View File

@ -543,9 +543,9 @@ void Tabs::onResize(ResizeEvent& ev)
updateTabs();
}
void Tabs::onPreferredSize(PreferredSizeEvent& ev)
void Tabs::onSizeHint(SizeHintEvent& ev)
{
ev.setPreferredSize(gfx::Size(0, m_tabsHeight));
ev.setSizeHint(gfx::Size(0, m_tabsHeight));
}
void Tabs::selectTabInternal(TabPtr& tab)

2
src/app/ui/tabs.h
View File

@ -174,7 +174,7 @@ namespace app {
bool onProcessMessage(ui::Message* msg) override;
void onPaint(ui::PaintEvent& ev) override;
void onResize(ui::ResizeEvent& ev) override;
void onPreferredSize(ui::PreferredSizeEvent& ev) override;
void onSizeHint(ui::SizeHintEvent& ev) override;
void onAnimationFrame() override;
void onAnimationStop(int animation) override;

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

@ -855,10 +855,10 @@ bool Timeline::onProcessMessage(Message* msg)
return Widget::onProcessMessage(msg);
}
void Timeline::onPreferredSize(PreferredSizeEvent& ev)
void Timeline::onSizeHint(SizeHintEvent& ev)
{
// This doesn't matter, the AniEditor'll use the entire screen anyway.
ev.setPreferredSize(Size(32, 32));
ev.setSizeHint(Size(32, 32));
}
void Timeline::onResize(ui::ResizeEvent& ev)
@ -866,7 +866,7 @@ void Timeline::onResize(ui::ResizeEvent& ev)
gfx::Rect rc = ev.getBounds();
setBoundsQuietly(rc);
gfx::Size sz = m_aniControls.getPreferredSize();
gfx::Size sz = m_aniControls.sizeHint();
m_aniControls.setBounds(
gfx::Rect(rc.x, rc.y, MIN(sz.w, m_separator_x),
getFont()->height() +

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

@ -105,7 +105,7 @@ namespace app {
protected:
bool onProcessMessage(ui::Message* msg) override;
void onPreferredSize(ui::PreferredSizeEvent& ev) override;
void onSizeHint(ui::SizeHintEvent& ev) override;
void onResize(ui::ResizeEvent& ev) override;
void onPaint(ui::PaintEvent& ev) override;

10
src/app/ui/toolbar.cpp
View File

@ -52,7 +52,7 @@ public:
protected:
bool onProcessMessage(Message* msg) override;
void onPreferredSize(PreferredSizeEvent& ev) override;
void onSizeHint(SizeHintEvent& ev) override;
void onPaint(PaintEvent& ev) override;
private:
@ -276,12 +276,12 @@ bool ToolBar::onProcessMessage(Message* msg)
return Widget::onProcessMessage(msg);
}
void ToolBar::onPreferredSize(PreferredSizeEvent& ev)
void ToolBar::onSizeHint(SizeHintEvent& ev)
{
Size iconsize = getToolIconSize(this);
iconsize.w += border().width();
iconsize.h += border().height();
ev.setPreferredSize(iconsize);
ev.setSizeHint(iconsize);
}
void ToolBar::onPaint(ui::PaintEvent& ev)
@ -661,7 +661,7 @@ bool ToolBar::ToolStrip::onProcessMessage(Message* msg)
return Widget::onProcessMessage(msg);
}
void ToolBar::ToolStrip::onPreferredSize(PreferredSizeEvent& ev)
void ToolBar::ToolStrip::onSizeHint(SizeHintEvent& ev)
{
ToolBox* toolbox = App::instance()->getToolBox();
int c = 0;
@ -674,7 +674,7 @@ void ToolBar::ToolStrip::onPreferredSize(PreferredSizeEvent& ev)
}
Size iconsize = getToolIconSize(this);
ev.setPreferredSize(Size(iconsize.w * c, iconsize.h));
ev.setSizeHint(Size(iconsize.w * c, iconsize.h));
}
void ToolBar::ToolStrip::onPaint(PaintEvent& ev)

2
src/app/ui/toolbar.h
View File

@ -48,7 +48,7 @@ namespace app {
protected:
bool onProcessMessage(ui::Message* msg) override;
void onPreferredSize(ui::PreferredSizeEvent& ev) override;
void onSizeHint(ui::SizeHintEvent& ev) override;
void onPaint(ui::PaintEvent& ev) override;
private:

2
src/app/widget_loader.cpp
View File

@ -557,7 +557,7 @@ void WidgetLoader::fillWidgetWithXmlElementAttributes(const TiXmlElement* elem,
if (childspacing)
widget->setChildSpacing(strtol(childspacing, NULL, 10)*guiscale());
gfx::Size reqSize = widget->getPreferredSize();
gfx::Size reqSize = widget->sizeHint();
if (minwidth || minheight) {
int w = (minwidth ? guiscale()*strtol(minwidth, NULL, 10): reqSize.w);

2
src/ui/CMakeLists.txt
View File

@ -32,13 +32,13 @@ add_library(ui-lib
paint_event.cpp
panel.cpp
popup_window.cpp
preferred_size_event.cpp
property.cpp
register_message.cpp
resize_event.cpp
scroll_bar.cpp
scroll_helper.cpp
separator.cpp
size_hint_event.cpp
slider.cpp
splitter.cpp
system.cpp

12
src/ui/box.cpp
View File

@ -11,7 +11,7 @@
#include "gfx/size.h"
#include "ui/box.h"
#include "ui/message.h"
#include "ui/preferred_size_event.h"
#include "ui/size_hint_event.h"
#include "ui/resize_event.h"
#include "ui/theme.h"
@ -26,7 +26,7 @@ Box::Box(int align)
initTheme();
}
void Box::onPreferredSize(PreferredSizeEvent& ev)
void Box::onSizeHint(SizeHintEvent& ev)
{
#define ADD_CHILD_SIZE(w, h) { \
if (getAlign() & HOMOGENEOUS) \
@ -53,7 +53,7 @@ void Box::onPreferredSize(PreferredSizeEvent& ev)
if (child->hasFlags(HIDDEN))
continue;
Size childSize = child->getPreferredSize();
Size childSize = child->sizeHint();
if (getAlign() & HORIZONTAL) {
ADD_CHILD_SIZE(w, h);
}
@ -74,7 +74,7 @@ void Box::onPreferredSize(PreferredSizeEvent& ev)
prefSize.w += border().width();
prefSize.h += border().height();
ev.setPreferredSize(prefSize);
ev.setSizeHint(prefSize);
}
void Box::onResize(ResizeEvent& ev)
@ -100,7 +100,7 @@ void Box::onResize(ResizeEvent& ev)
size = availSize.w; \
} \
else { \
size = child->getPreferredSize().w; \
size = child->sizeHint().w; \
\
if (child->isExpansive()) { \
int extraSize = (availExtraSize / (expansiveChildren-j)); \
@ -132,7 +132,7 @@ void Box::onResize(ResizeEvent& ev)
}
if (visibleChildren > 0) {
Size prefSize(getPreferredSize());
Size prefSize(sizeHint());
Size availSize(getChildrenBounds().getSize());
int homogeneousSize = 0;
int availExtraSize = 0;

2
src/ui/box.h
View File

@ -19,7 +19,7 @@ namespace ui {
protected:
// Events
void onPreferredSize(PreferredSizeEvent& ev) override;
void onSizeHint(SizeHintEvent& ev) override;
void onResize(ResizeEvent& ev) override;
void onPaint(PaintEvent& ev) override;
};

8
src/ui/button.cpp
View File

@ -11,7 +11,7 @@
#include "ui/button.h"
#include "ui/manager.h"
#include "ui/message.h"
#include "ui/preferred_size_event.h"
#include "ui/size_hint_event.h"
#include "ui/theme.h"
#include "ui/widget.h"
#include "ui/window.h"
@ -271,7 +271,7 @@ bool ButtonBase::onProcessMessage(Message* msg)
return Widget::onProcessMessage(msg);
}
void ButtonBase::onPreferredSize(PreferredSizeEvent& ev)
void ButtonBase::onSizeHint(SizeHintEvent& ev)
{
gfx::Rect box;
gfx::Size iconSize = (m_iconInterface ? m_iconInterface->getSize(): gfx::Size(0, 0));
@ -280,8 +280,8 @@ void ButtonBase::onPreferredSize(PreferredSizeEvent& ev)
iconSize.w,
iconSize.h);
ev.setPreferredSize(box.w + border().width(),
box.h + border().height());
ev.setSizeHint(box.w + border().width(),
box.h + border().height());
}
void ButtonBase::onPaint(PaintEvent& ev)

2
src/ui/button.h
View File

@ -57,7 +57,7 @@ namespace ui {
protected:
// Events
bool onProcessMessage(Message* msg) override;
void onPreferredSize(PreferredSizeEvent& ev) override;
void onSizeHint(SizeHintEvent& ev) override;
void onPaint(PaintEvent& ev) override;
// New events

10
src/ui/combobox.cpp
View File

@ -386,7 +386,7 @@ void ComboBox::onResize(ResizeEvent& ev)
setBoundsQuietly(bounds);
// Button
Size buttonSize = m_button->getPreferredSize();
Size buttonSize = m_button->sizeHint();
m_button->setBounds(Rect(bounds.x2() - buttonSize.w, bounds.y,
buttonSize.w, bounds.h));
@ -395,10 +395,10 @@ void ComboBox::onResize(ResizeEvent& ev)
bounds.w - buttonSize.w, bounds.h));
}
void ComboBox::onPreferredSize(PreferredSizeEvent& ev)
void ComboBox::onSizeHint(SizeHintEvent& ev)
{
Size reqSize(0, 0);
Size entrySize = m_entry->getPreferredSize();
Size entrySize = m_entry->sizeHint();
// Get the text-length of every item and put in 'w' the maximum value
ListItems::iterator it, end = m_items.end();
@ -414,10 +414,10 @@ void ComboBox::onPreferredSize(PreferredSizeEvent& ev)
reqSize.w += entrySize.w;
reqSize.h += entrySize.h;
Size buttonSize = m_button->getPreferredSize();
Size buttonSize = m_button->sizeHint();
reqSize.w += buttonSize.w;
reqSize.h = MAX(reqSize.h, buttonSize.h);
ev.setPreferredSize(reqSize);
ev.setSizeHint(reqSize);
}
bool ComboBoxEntry::onProcessMessage(Message* msg)

2
src/ui/combobox.h
View File

@ -92,7 +92,7 @@ namespace ui {
protected:
bool onProcessMessage(Message* msg) override;
void onResize(ResizeEvent& ev) override;
void onPreferredSize(PreferredSizeEvent& ev) override;
void onSizeHint(SizeHintEvent& ev) override;
virtual void onChange();
virtual void onOpenListBox();
virtual void onCloseListBox();

6
src/ui/entry.cpp
View File

@ -17,7 +17,7 @@
#include "ui/manager.h"
#include "ui/menu.h"
#include "ui/message.h"
#include "ui/preferred_size_event.h"
#include "ui/size_hint_event.h"
#include "ui/system.h"
#include "ui/theme.h"
#include "ui/widget.h"
@ -425,7 +425,7 @@ bool Entry::onProcessMessage(Message* msg)
return Widget::onProcessMessage(msg);
}
void Entry::onPreferredSize(PreferredSizeEvent& ev)
void Entry::onSizeHint(SizeHintEvent& ev)
{
int w =
+ getFont()->charWidth('w') * MIN(m_maxsize, 6)
@ -438,7 +438,7 @@ void Entry::onPreferredSize(PreferredSizeEvent& ev)
+ getFont()->height()
+ border().height();
ev.setPreferredSize(w, h);
ev.setSizeHint(w, h);
}
void Entry::onPaint(PaintEvent& ev)

2
src/ui/entry.h
View File

@ -48,7 +48,7 @@ namespace ui {
protected:
// Events
bool onProcessMessage(Message* msg) override;
void onPreferredSize(PreferredSizeEvent& ev) override;
void onSizeHint(SizeHintEvent& ev) override;
void onPaint(PaintEvent& ev) override;
void onSetText() override;

10
src/ui/grid.cpp
View File

@ -12,7 +12,7 @@
#include "gfx/size.h"
#include "ui/grid.h"
#include "ui/message.h"
#include "ui/preferred_size_event.h"
#include "ui/size_hint_event.h"
#include "ui/resize_event.h"
#include "ui/theme.h"
#include "ui/widget.h"
@ -146,7 +146,7 @@ void Grid::onResize(ResizeEvent& ev)
calculateCellSize(col, cell->hspan, m_colstrip, w);
calculateCellSize(row, cell->vspan, m_rowstrip, h);
reqSize = cell->child->getPreferredSize();
reqSize = cell->child->sizeHint();
if (cell->align & LEFT) {
w = reqSize.w;
@ -189,7 +189,7 @@ void Grid::onResize(ResizeEvent& ev)
}
}
void Grid::onPreferredSize(PreferredSizeEvent& ev)
void Grid::onSizeHint(SizeHintEvent& ev)
{
int w, h;
@ -204,7 +204,7 @@ void Grid::onPreferredSize(PreferredSizeEvent& ev)
w += border().width();
h += border().height();
ev.setPreferredSize(Size(w, h));
ev.setSizeHint(Size(w, h));
}
void Grid::onPaint(PaintEvent& ev)
@ -286,7 +286,7 @@ void Grid::calculateStripSize(std::vector<Strip>& colstrip,
if (cell->parent == NULL) {
// If the widget isn't hidden then we can request its size
if (!(cell->child->hasFlags(HIDDEN))) {
Size reqSize = cell->child->getPreferredSize();
Size reqSize = cell->child->sizeHint();
cell->w = reqSize.w - (cell->hspan-1) * this->childSpacing();
cell->h = reqSize.h - (cell->vspan-1) * this->childSpacing();

2
src/ui/grid.h
View File

@ -35,7 +35,7 @@ namespace ui {
protected:
// Events
void onResize(ResizeEvent& ev) override;
void onPreferredSize(PreferredSizeEvent& ev) override;
void onSizeHint(SizeHintEvent& ev) override;
void onPaint(PaintEvent& ev) override;
private:

16
src/ui/grid_ui_tests.cpp
View File

@ -26,24 +26,24 @@ TEST(Grid, Simple2x1Grid)
grid->addChildInCell(w2, 1, 1, 0);
// Test request-size
Size reqSize = grid->getPreferredSize();
Size reqSize = grid->sizeHint();
EXPECT_EQ(20, reqSize.w);
EXPECT_EQ(10, reqSize.h);
// Test child-spacing
grid->setChildSpacing(2);
reqSize = grid->getPreferredSize();
reqSize = grid->sizeHint();
EXPECT_EQ(22, reqSize.w);
EXPECT_EQ(10, reqSize.h);
// Test borders
grid->setBorder(gfx::Border(3, 0, 0, 3));
reqSize = grid->getPreferredSize();
reqSize = grid->sizeHint();
EXPECT_EQ(25, reqSize.w);
EXPECT_EQ(13, reqSize.h);
grid->setBorder(gfx::Border(3, 2, 5, 3));
reqSize = grid->getPreferredSize();
reqSize = grid->sizeHint();
EXPECT_EQ(30, reqSize.w);
EXPECT_EQ(15, reqSize.h);
@ -63,7 +63,7 @@ TEST(Grid, Expand2ndWidget)
grid->addChildInCell(w2, 1, 1, HORIZONTAL | TOP);
// Test request size
Size reqSize = grid->getPreferredSize();
Size reqSize = grid->sizeHint();
EXPECT_EQ(30, reqSize.w);
EXPECT_EQ(20, reqSize.h);
@ -96,7 +96,7 @@ TEST(Grid, SameWidth2x1Grid)
grid->addChildInCell(w2, 1, 1, 0);
// Test request size
Size reqSize = grid->getPreferredSize();
Size reqSize = grid->sizeHint();
EXPECT_EQ(40, reqSize.w);
EXPECT_EQ(20, reqSize.h);
@ -165,7 +165,7 @@ TEST(Grid, Intrincate3x3Grid)
// Test request size
grid->setChildSpacing(2);
Size reqSize = grid->getPreferredSize();
Size reqSize = grid->sizeHint();
EXPECT_EQ(22, reqSize.w);
EXPECT_EQ(22, reqSize.h);
@ -217,7 +217,7 @@ TEST(Grid, FourColumns)
// Test request size
grid.setChildSpacing(0);
EXPECT_EQ(gfx::Size(40, 20), grid.getPreferredSize());
EXPECT_EQ(gfx::Size(40, 20), grid.sizeHint());
// Test layout
grid.setBounds(gfx::Rect(0, 0, 40, 20));

6
src/ui/image_view.cpp
View File

@ -14,7 +14,7 @@
#include "ui/graphics.h"
#include "ui/message.h"
#include "ui/paint_event.h"
#include "ui/preferred_size_event.h"
#include "ui/size_hint_event.h"
#include "ui/system.h"
#include "ui/theme.h"
@ -27,13 +27,13 @@ ImageView::ImageView(she::Surface* sur, int align)
setAlign(align);
}
void ImageView::onPreferredSize(PreferredSizeEvent& ev)
void ImageView::onSizeHint(SizeHintEvent& ev)
{
gfx::Rect box;
getTextIconInfo(&box, NULL, NULL,
getAlign(), m_sur->width(), m_sur->height());
ev.setPreferredSize(
ev.setSizeHint(
gfx::Size(
box.w + border().width(),
box.h + border().height()));

2
src/ui/image_view.h
View File

@ -22,7 +22,7 @@ namespace ui {
ImageView(she::Surface* sur, int align);
protected:
void onPreferredSize(PreferredSizeEvent& ev) override;
void onSizeHint(SizeHintEvent& ev) override;
void onPaint(PaintEvent& ev) override;
private:

8
src/ui/int_entry.cpp
View File

@ -17,7 +17,7 @@
#include "ui/manager.h"
#include "ui/message.h"
#include "ui/popup_window.h"
#include "ui/preferred_size_event.h"
#include "ui/size_hint_event.h"
#include "ui/slider.h"
#include "ui/system.h"
#include "ui/theme.h"
@ -127,7 +127,7 @@ bool IntEntry::onProcessMessage(Message* msg)
return Entry::onProcessMessage(msg);
}
void IntEntry::onPreferredSize(PreferredSizeEvent& ev)
void IntEntry::onSizeHint(SizeHintEvent& ev)
{
int min_w = getFont()->textLength(m_slider.convertValueToText(m_min));
int max_w = getFont()->textLength(m_slider.convertValueToText(m_max));
@ -138,7 +138,7 @@ void IntEntry::onPreferredSize(PreferredSizeEvent& ev)
w += border().width();
h += border().height();
ev.setPreferredSize(w, h);
ev.setSizeHint(w, h);
}
void IntEntry::onChange()
@ -157,7 +157,7 @@ void IntEntry::openPopup()
m_slider.setValue(getValue());
Rect rc = getBounds();
int sliderH = m_slider.getPreferredSize().h;
int sliderH = m_slider.sizeHint().h;
if (rc.y+rc.h+sliderH < ui::display_h())
rc.y += rc.h;

2
src/ui/int_entry.h
View File

@ -26,7 +26,7 @@ namespace ui {
protected:
bool onProcessMessage(Message* msg) override;
void onPreferredSize(PreferredSizeEvent& ev) override;
void onSizeHint(SizeHintEvent& ev) override;
void onChange() override;
// New events

6
src/ui/label.cpp
View File

@ -11,7 +11,7 @@
#include "she/font.h"
#include "ui/label.h"
#include "ui/message.h"
#include "ui/preferred_size_event.h"
#include "ui/size_hint_event.h"
#include "ui/theme.h"
namespace ui {
@ -24,7 +24,7 @@ Label::Label(const std::string& text)
initTheme();
}
void Label::onPreferredSize(PreferredSizeEvent& ev)
void Label::onSizeHint(SizeHintEvent& ev)
{
gfx::Size sz(0, 0);
@ -37,7 +37,7 @@ void Label::onPreferredSize(PreferredSizeEvent& ev)
sz.w += border().width();
sz.h += border().height();
ev.setPreferredSize(sz);
ev.setSizeHint(sz);
}
void Label::onPaint(PaintEvent& ev)

2
src/ui/label.h
View File

@ -18,7 +18,7 @@ namespace ui {
Label(const std::string& text);
protected:
void onPreferredSize(PreferredSizeEvent& ev) override;
void onSizeHint(SizeHintEvent& ev) override;
void onPaint(PaintEvent& ev) override;
};

10
src/ui/listbox.cpp
View File

@ -13,7 +13,7 @@
#include "base/path.h"
#include "ui/listitem.h"
#include "ui/message.h"
#include "ui/preferred_size_event.h"
#include "ui/size_hint_event.h"
#include "ui/resize_event.h"
#include "ui/system.h"
#include "ui/theme.h"
@ -289,19 +289,19 @@ void ListBox::onResize(ResizeEvent& ev)
Rect cpos = getChildrenBounds();
for (auto child : children()) {
cpos.h = child->getPreferredSize().h;
cpos.h = child->sizeHint().h;
child->setBounds(cpos);
cpos.y += child->getBounds().h + this->childSpacing();
}
}
void ListBox::onPreferredSize(PreferredSizeEvent& ev)
void ListBox::onSizeHint(SizeHintEvent& ev)
{
int w = 0, h = 0;
UI_FOREACH_WIDGET_WITH_END(children(), it, end) {
Size reqSize = static_cast<ListItem*>(*it)->getPreferredSize();
Size reqSize = static_cast<ListItem*>(*it)->sizeHint();
w = MAX(w, reqSize.w);
h += reqSize.h + (it+1 != end ? this->childSpacing(): 0);
@ -310,7 +310,7 @@ void ListBox::onPreferredSize(PreferredSizeEvent& ev)
w += border().width();
h += border().height();
ev.setPreferredSize(Size(w, h));
ev.setSizeHint(Size(w, h));
}
void ListBox::onChange()

2
src/ui/listbox.h
View File

@ -38,7 +38,7 @@ namespace ui {
virtual bool onProcessMessage(Message* msg) override;
virtual void onPaint(PaintEvent& ev) override;
virtual void onResize(ResizeEvent& ev) override;
virtual void onPreferredSize(PreferredSizeEvent& ev) override;
virtual void onSizeHint(SizeHintEvent& ev) override;
virtual void onChange();
virtual void onDoubleClickItem();
};

8
src/ui/listitem.cpp
View File

@ -11,7 +11,7 @@
#include "ui/listitem.h"
#include "ui/message.h"
#include "ui/preferred_size_event.h"
#include "ui/size_hint_event.h"
#include "ui/resize_event.h"
#include "ui/theme.h"
#include "ui/view.h"
@ -43,7 +43,7 @@ void ListItem::onResize(ResizeEvent& ev)
child->setBounds(crect);
}
void ListItem::onPreferredSize(PreferredSizeEvent& ev)
void ListItem::onSizeHint(SizeHintEvent& ev)
{
int w = 0, h = 0;
Size maxSize;
@ -54,7 +54,7 @@ void ListItem::onPreferredSize(PreferredSizeEvent& ev)
maxSize.w = maxSize.h = 0;
for (auto child : children()) {
Size reqSize = child->getPreferredSize();
Size reqSize = child->sizeHint();
maxSize.w = MAX(maxSize.w, reqSize.w);
maxSize.h = MAX(maxSize.h, reqSize.h);
@ -63,7 +63,7 @@ void ListItem::onPreferredSize(PreferredSizeEvent& ev)
w = maxSize.w + border().width();
h = maxSize.h + border().height();
ev.setPreferredSize(Size(w, h));
ev.setSizeHint(Size(w, h));
}
} // namespace ui

2
src/ui/listitem.h
View File

@ -25,7 +25,7 @@ namespace ui {
protected:
void onPaint(PaintEvent& ev) override;
void onResize(ResizeEvent& ev) override;
void onPreferredSize(PreferredSizeEvent& ev) override;
void onSizeHint(SizeHintEvent& ev) override;
private:
std::string m_value;

4
src/ui/manager.cpp
View File

@ -1121,7 +1121,7 @@ void Manager::onNewDisplayConfiguration()
flushRedraw();
}
void Manager::onPreferredSize(PreferredSizeEvent& ev)
void Manager::onSizeHint(SizeHintEvent& ev)
{
int w = 0, h = 0;
@ -1141,7 +1141,7 @@ void Manager::onPreferredSize(PreferredSizeEvent& ev)
h = pos.h;
}
ev.setPreferredSize(gfx::Size(w, h));
ev.setSizeHint(gfx::Size(w, h));
}
void Manager::pumpQueue()

2
src/ui/manager.h
View File

@ -95,7 +95,7 @@ namespace ui {
bool onProcessMessage(Message* msg) override;
void onResize(ResizeEvent& ev) override;
void onPaint(PaintEvent& ev) override;
void onPreferredSize(PreferredSizeEvent& ev) override;
void onSizeHint(SizeHintEvent& ev) override;
void onBroadcastMouseMessage(WidgetsList& targets) override;
virtual LayoutIO* onGetLayoutIO();
virtual void onNewDisplayConfiguration();

18
src/ui/menu.cpp
View File

@ -320,7 +320,7 @@ void Menu::onResize(ResizeEvent& ev)
bool isBar = (getParent()->type() == kMenuBarWidget);
for (auto child : children()) {
Size reqSize = child->getPreferredSize();
Size reqSize = child->sizeHint();
if (isBar)
cpos.w = reqSize.w;
@ -336,13 +336,13 @@ void Menu::onResize(ResizeEvent& ev)
}
}
void Menu::onPreferredSize(PreferredSizeEvent& ev)
void Menu::onSizeHint(SizeHintEvent& ev)
{
Size size(0, 0);
Size reqSize;
UI_FOREACH_WIDGET_WITH_END(children(), it, end) {
reqSize = (*it)->getPreferredSize();
reqSize = (*it)->sizeHint();
if (getParent() && getParent()->type() == kMenuBarWidget) {
size.w += reqSize.w + ((it+1 != end) ? childSpacing(): 0);
@ -357,7 +357,7 @@ void Menu::onPreferredSize(PreferredSizeEvent& ev)
size.w += border().width();
size.h += border().height();
ev.setPreferredSize(size);
ev.setSizeHint(size);
}
bool MenuBox::onProcessMessage(Message* msg)
@ -668,17 +668,17 @@ void MenuBox::onResize(ResizeEvent& ev)
menu->setBounds(getChildrenBounds());
}
void MenuBox::onPreferredSize(PreferredSizeEvent& ev)
void MenuBox::onSizeHint(SizeHintEvent& ev)
{
Size size(0, 0);
if (Menu* menu = getMenu())
size = menu->getPreferredSize();
size = menu->sizeHint();
size.w += border().width();
size.h += border().height();
ev.setPreferredSize(size);
ev.setSizeHint(size);
}
bool MenuItem::onProcessMessage(Message* msg)
@ -880,7 +880,7 @@ void MenuItem::onClick()
Click();
}
void MenuItem::onPreferredSize(PreferredSizeEvent& ev)
void MenuItem::onSizeHint(SizeHintEvent& ev)
{
Size size(0, 0);
@ -895,7 +895,7 @@ void MenuItem::onPreferredSize(PreferredSizeEvent& ev)
+ border().height();
}
ev.setPreferredSize(size);
ev.setSizeHint(size);
}
// Climbs the hierarchy of menus to get the most-top menubox.

6
src/ui/menu.h
View File

@ -35,7 +35,7 @@ namespace ui {
protected:
virtual void onPaint(PaintEvent& ev) override;
virtual void onResize(ResizeEvent& ev) override;
virtual void onPreferredSize(PreferredSizeEvent& ev) override;
virtual void onSizeHint(SizeHintEvent& ev) override;
private:
void setOwnerMenuItem(MenuItem* ownerMenuItem) {
@ -73,7 +73,7 @@ namespace ui {
protected:
virtual bool onProcessMessage(Message* msg) override;
virtual void onResize(ResizeEvent& ev) override;
virtual void onPreferredSize(PreferredSizeEvent& ev) override;
virtual void onSizeHint(SizeHintEvent& ev) override;
MenuBaseData* createBase();
private:
@ -126,7 +126,7 @@ namespace ui {
protected:
virtual bool onProcessMessage(Message* msg) override;
virtual void onPaint(PaintEvent& ev) override;
virtual void onPreferredSize(PreferredSizeEvent& ev) override;
virtual void onSizeHint(SizeHintEvent& ev) override;
virtual void onClick();
bool inBar();

8
src/ui/panel.cpp
View File

@ -11,7 +11,7 @@
#include "ui/panel.h"
#include "ui/resize_event.h"
#include "ui/preferred_size_event.h"
#include "ui/size_hint_event.h"
namespace ui {
@ -42,14 +42,14 @@ void Panel::onResize(ResizeEvent& ev)
}
}
void Panel::onPreferredSize(PreferredSizeEvent& ev)
void Panel::onSizeHint(SizeHintEvent& ev)
{
gfx::Size maxSize(0, 0);
gfx::Size reqSize;
for (auto child : children()) {
if (!child->isDecorative()) {
reqSize = child->getPreferredSize();
reqSize = child->sizeHint();
maxSize.w = MAX(maxSize.w, reqSize.w);
maxSize.h = MAX(maxSize.h, reqSize.h);
@ -59,7 +59,7 @@ void Panel::onPreferredSize(PreferredSizeEvent& ev)
if (hasText())
maxSize.w = MAX(maxSize.w, getTextWidth());
ev.setPreferredSize(
ev.setSizeHint(
maxSize.w + border().width(),
maxSize.h + border().height());
}

2
src/ui/panel.h
View File

@ -20,7 +20,7 @@ namespace ui {
protected:
virtual void onResize(ResizeEvent& ev) override;
virtual void onPreferredSize(PreferredSizeEvent& ev) override;
virtual void onSizeHint(SizeHintEvent& ev) override;
};
} // namespace ui

8
src/ui/popup_window.cpp
View File

@ -11,7 +11,7 @@
#include "gfx/size.h"
#include "ui/graphics.h"
#include "ui/intern.h"
#include "ui/preferred_size_event.h"
#include "ui/size_hint_event.h"
#include "ui/theme.h"
#include "ui/ui.h"
@ -149,7 +149,7 @@ bool PopupWindow::onProcessMessage(Message* msg)
return Window::onProcessMessage(msg);
}
void PopupWindow::onPreferredSize(PreferredSizeEvent& ev)
void PopupWindow::onSizeHint(SizeHintEvent& ev)
{
ScreenGraphics g;
g.setFont(getFont());
@ -168,7 +168,7 @@ void PopupWindow::onPreferredSize(PreferredSizeEvent& ev)
Size reqSize;
for (auto child : children()) {
reqSize = child->getPreferredSize();
reqSize = child->sizeHint();
maxSize.w = MAX(maxSize.w, reqSize.w);
maxSize.h = MAX(maxSize.h, reqSize.h);
@ -178,7 +178,7 @@ void PopupWindow::onPreferredSize(PreferredSizeEvent& ev)
resultSize.h += maxSize.h;
}
ev.setPreferredSize(resultSize);
ev.setSizeHint(resultSize);
}
void PopupWindow::onPaint(PaintEvent& ev)

2
src/ui/popup_window.h
View File

@ -38,7 +38,7 @@ namespace ui {
protected:
bool onProcessMessage(Message* msg) override;
void onPreferredSize(PreferredSizeEvent& ev) override;
void onSizeHint(SizeHintEvent& ev) override;
void onPaint(PaintEvent& ev) override;
void onInitTheme(InitThemeEvent& ev) override;
void onHitTest(HitTestEvent& ev) override;

40
src/ui/preferred_size_event.h
View File

@ -1,40 +0,0 @@
// Aseprite UI Library
// Copyright (C) 2001-2013 David Capello
//
// This file is released under the terms of the MIT license.
// Read LICENSE.txt for more information.
#ifndef UI_PREFERRED_SIZE_EVENT_H_INCLUDED
#define UI_PREFERRED_SIZE_EVENT_H_INCLUDED
#pragma once
#include "gfx/size.h"
#include "ui/event.h"
namespace ui {
class Widget;
class PreferredSizeEvent : public Event
{
gfx::Size m_fitIn;
gfx::Size m_preferredSize;
public:
PreferredSizeEvent(Widget* source, const gfx::Size& fitIn);
virtual ~PreferredSizeEvent();
gfx::Size fitInSize() const;
int fitInWidth() const;
int fitInHeight() const;
gfx::Size getPreferredSize() const;
void setPreferredSize(const gfx::Size& preferredSize);
void setPreferredSize(int w, int h);
};
} // namespace ui
#endif

8
src/ui/separator.cpp
View File

@ -12,7 +12,7 @@
#include "gfx/size.h"
#include "ui/message.h"
#include "ui/preferred_size_event.h"
#include "ui/size_hint_event.h"
#include "ui/theme.h"
namespace ui {
@ -34,12 +34,12 @@ void Separator::onPaint(PaintEvent& ev)
getTheme()->paintSeparator(ev);
}
void Separator::onPreferredSize(PreferredSizeEvent& ev)
void Separator::onSizeHint(SizeHintEvent& ev)
{
Size maxSize(0, 0);
for (auto child : children()) {
Size reqSize = child->getPreferredSize();
Size reqSize = child->sizeHint();
maxSize.w = MAX(maxSize.w, reqSize.w);
maxSize.h = MAX(maxSize.h, reqSize.h);
}
@ -52,7 +52,7 @@ void Separator::onPreferredSize(PreferredSizeEvent& ev)
int w = maxSize.w + border().width();
int h = maxSize.h + border().height();
ev.setPreferredSize(Size(w, h));
ev.setSizeHint(Size(w, h));
}
} // namespace ui

2
src/ui/separator.h
View File

@ -19,7 +19,7 @@ namespace ui {
protected:
void onPaint(PaintEvent& ev) override;
void onPreferredSize(PreferredSizeEvent& ev) override;
void onSizeHint(SizeHintEvent& ev) override;
};
} // namespace ui

32
src/ui/preferred_size_event.cpp → src/ui/size_hint_event.cpp
View File

@ -1,5 +1,5 @@
// Aseprite UI Library
// Copyright (C) 2001-2013 David Capello
// Copyright (C) 2001-2013, 2015 David Capello
//
// This file is released under the terms of the MIT license.
// Read LICENSE.txt for more information.
@ -8,7 +8,7 @@
#include "config.h"
#endif
#include "ui/preferred_size_event.h"
#include "ui/size_hint_event.h"
#include "ui/widget.h"
namespace ui {
@ -26,52 +26,52 @@ using namespace gfx;
without restrictions. If its width or height is greater than 0,
you could try to fit your widget to that width or height.
*/
PreferredSizeEvent::PreferredSizeEvent(Widget* source, const Size& fitIn)
SizeHintEvent::SizeHintEvent(Widget* source, const Size& fitIn)
: Event(source)
, m_fitIn(fitIn)
, m_preferredSize(0, 0)
, m_sizeHint(0, 0)
{
}
/**
Destroys the PreferredSizeEvent.
Destroys the SizeHintEvent.
*/
PreferredSizeEvent::~PreferredSizeEvent()
SizeHintEvent::~SizeHintEvent()
{
}
Size PreferredSizeEvent::fitInSize() const
Size SizeHintEvent::fitInSize() const
{
return m_fitIn;
}
int PreferredSizeEvent::fitInWidth() const
int SizeHintEvent::fitInWidth() const
{
return m_fitIn.w;
}
int PreferredSizeEvent::fitInHeight() const
int SizeHintEvent::fitInHeight() const
{
return m_fitIn.h;
}
Size PreferredSizeEvent::getPreferredSize() const
Size SizeHintEvent::sizeHint() const
{
return m_preferredSize;
return m_sizeHint;
}
void PreferredSizeEvent::setPreferredSize(const Size& preferredSize)
void SizeHintEvent::setSizeHint(const Size& sz)
{
m_preferredSize = preferredSize;
m_sizeHint = sz;
}
/**
Sets the preferred size for the widget.
*/
void PreferredSizeEvent::setPreferredSize(int w, int h)
void SizeHintEvent::setSizeHint(int w, int h)
{
m_preferredSize.w = w;
m_preferredSize.h = h;
m_sizeHint.w = w;
m_sizeHint.h = h;
}
} // namespace ui

39
src/ui/size_hint_event.h Normal file
View File

@ -0,0 +1,39 @@
// Aseprite UI Library
// Copyright (C) 2001-2013, 2015 David Capello
//
// This file is released under the terms of the MIT license.
// Read LICENSE.txt for more information.
#ifndef UI_SIZE_HINT_EVENT_H_INCLUDED
#define UI_SIZE_HINT_EVENT_H_INCLUDED
#pragma once
#include "gfx/size.h"
#include "ui/event.h"
namespace ui {
class Widget;
class SizeHintEvent : public Event {
gfx::Size m_fitIn;
gfx::Size m_sizeHint;
public:
SizeHintEvent(Widget* source, const gfx::Size& fitIn);
virtual ~SizeHintEvent();
gfx::Size fitInSize() const;
int fitInWidth() const;
int fitInHeight() const;
gfx::Size sizeHint() const;
void setSizeHint(const gfx::Size& sz);
void setSizeHint(int w, int h);
};
} // namespace ui
#endif

6
src/ui/slider.cpp
View File

@ -13,7 +13,7 @@
#include "she/font.h"
#include "ui/manager.h"
#include "ui/message.h"
#include "ui/preferred_size_event.h"
#include "ui/size_hint_event.h"
#include "ui/system.h"
#include "ui/theme.h"
#include "ui/widget.h"
@ -214,7 +214,7 @@ not_used:;
return Widget::onProcessMessage(msg);
}
void Slider::onPreferredSize(PreferredSizeEvent& ev)
void Slider::onSizeHint(SizeHintEvent& ev)
{
int min_w = getFont()->textLength(convertValueToText(m_min));
int max_w = getFont()->textLength(convertValueToText(m_max));
@ -225,7 +225,7 @@ void Slider::onPreferredSize(PreferredSizeEvent& ev)
w += border().width();
h += border().height();
ev.setPreferredSize(w, h);
ev.setSizeHint(w, h);
}
void Slider::onPaint(PaintEvent& ev)

2
src/ui/slider.h
View File

@ -46,7 +46,7 @@ namespace ui {
protected:
// Events
bool onProcessMessage(Message* msg) override;
void onPreferredSize(PreferredSizeEvent& ev) override;
void onSizeHint(SizeHintEvent& ev) override;
void onPaint(PaintEvent& ev) override;
// New events

8
src/ui/splitter.cpp
View File

@ -13,7 +13,7 @@
#include "ui/load_layout_event.h"
#include "ui/manager.h"
#include "ui/message.h"
#include "ui/preferred_size_event.h"
#include "ui/size_hint_event.h"
#include "ui/resize_event.h"
#include "ui/save_layout_event.h"
#include "ui/system.h"
@ -238,7 +238,7 @@ void Splitter::onPaint(PaintEvent& ev)
getTheme()->paintSplitter(ev);
}
void Splitter::onPreferredSize(PreferredSizeEvent& ev)
void Splitter::onSizeHint(SizeHintEvent& ev)
{
#define GET_CHILD_SIZE(w, h) \
do { \
@ -268,7 +268,7 @@ void Splitter::onPreferredSize(PreferredSizeEvent& ev)
if (!child->isVisible())
continue;
reqSize = child->getPreferredSize();
reqSize = child->sizeHint();
if (this->getAlign() & HORIZONTAL)
GET_CHILD_SIZE(w, h);
@ -286,7 +286,7 @@ void Splitter::onPreferredSize(PreferredSizeEvent& ev)
w += border().width();
h += border().height();
ev.setPreferredSize(Size(w, h));
ev.setSizeHint(Size(w, h));
}
void Splitter::onLoadLayout(LoadLayoutEvent& ev)

2
src/ui/splitter.h
View File

@ -27,7 +27,7 @@ namespace ui {
bool onProcessMessage(Message* msg) override;
void onResize(ResizeEvent& ev) override;
void onPaint(PaintEvent& ev) override;
void onPreferredSize(PreferredSizeEvent& ev) override;
void onSizeHint(SizeHintEvent& ev) override;
void onLoadLayout(LoadLayoutEvent& ev) override;
void onSaveLayout(SaveLayoutEvent& ev) override;

6
src/ui/textbox.cpp
View File

@ -13,7 +13,7 @@
#include "gfx/size.h"
#include "ui/intern.h"
#include "ui/message.h"
#include "ui/preferred_size_event.h"
#include "ui/size_hint_event.h"
#include "ui/system.h"
#include "ui/theme.h"
#include "ui/view.h"
@ -147,7 +147,7 @@ void TextBox::onPaint(PaintEvent& ev)
getTheme()->paintTextBox(ev);
}
void TextBox::onPreferredSize(PreferredSizeEvent& ev)
void TextBox::onSizeHint(SizeHintEvent& ev)
{
int w = 0;
int h = 0;
@ -175,7 +175,7 @@ void TextBox::onPreferredSize(PreferredSizeEvent& ev)
w = min;
}
ev.setPreferredSize(gfx::Size(w, h));
ev.setSizeHint(gfx::Size(w, h));
}
void TextBox::onSetText()

2
src/ui/textbox.h
View File

@ -20,7 +20,7 @@ namespace ui {
protected:
bool onProcessMessage(Message* msg) override;
void onPaint(PaintEvent& ev) override;
void onPreferredSize(PreferredSizeEvent& ev) override;
void onSizeHint(SizeHintEvent& ev) override;
void onSetText() override;
private:

8
src/ui/tooltips.cpp
View File

@ -17,7 +17,7 @@
#include "ui/manager.h"
#include "ui/message.h"
#include "ui/paint_event.h"
#include "ui/preferred_size_event.h"
#include "ui/size_hint_event.h"
#include "ui/system.h"
#include "ui/theme.h"
@ -232,7 +232,7 @@ bool TipWindow::onProcessMessage(Message* msg)
return PopupWindow::onProcessMessage(msg);
}
void TipWindow::onPreferredSize(PreferredSizeEvent& ev)
void TipWindow::onSizeHint(SizeHintEvent& ev)
{
ScreenGraphics g;
g.setFont(getFont());
@ -248,7 +248,7 @@ void TipWindow::onPreferredSize(PreferredSizeEvent& ev)
Size reqSize;
for (auto child : children()) {
reqSize = child->getPreferredSize();
reqSize = child->sizeHint();
maxSize.w = MAX(maxSize.w, reqSize.w);
maxSize.h = MAX(maxSize.h, reqSize.h);
@ -258,7 +258,7 @@ void TipWindow::onPreferredSize(PreferredSizeEvent& ev)
resultSize.h += maxSize.h;
}
ev.setPreferredSize(resultSize);
ev.setSizeHint(resultSize);
}
void TipWindow::onInitTheme(InitThemeEvent& ev)

2
src/ui/tooltips.h
View File

@ -69,7 +69,7 @@ namespace ui {
protected:
bool onProcessMessage(Message* msg) override;
void onPreferredSize(PreferredSizeEvent& ev) override;
void onSizeHint(SizeHintEvent& ev) override;
void onInitTheme(InitThemeEvent& ev) override;
void onPaint(PaintEvent& ev) override;

4
src/ui/ui.h
View File

@ -1,5 +1,5 @@
// Aseprite UI Library
// Copyright (C) 2001-2013 David Capello
// Copyright (C) 2001-2013, 2015 David Capello
//
// This file is released under the terms of the MIT license.
// Read LICENSE.txt for more information.
@ -44,7 +44,7 @@
#include "ui/paint_event.h"
#include "ui/panel.h"
#include "ui/popup_window.h"
#include "ui/preferred_size_event.h"
#include "ui/size_hint_event.h"
#include "ui/property.h"
#include "ui/register_message.h"
#include "ui/resize_event.h"

8
src/ui/view.cpp
View File

@ -11,7 +11,7 @@
#include "gfx/size.h"
#include "ui/intern.h"
#include "ui/message.h"
#include "ui/preferred_size_event.h"
#include "ui/size_hint_event.h"
#include "ui/resize_event.h"
#include "ui/scroll_helper.h"
#include "ui/system.h"
@ -215,12 +215,12 @@ void View::onResize(ResizeEvent& ev)
updateView();
}
void View::onPreferredSize(PreferredSizeEvent& ev)
void View::onSizeHint(SizeHintEvent& ev)
{
Size viewSize = m_viewport.getPreferredSize();
Size viewSize = m_viewport.sizeHint();
viewSize.w += border().width();
viewSize.h += border().height();
ev.setPreferredSize(viewSize);
ev.setSizeHint(viewSize);
}
void View::onPaint(PaintEvent& ev)

Some files were not shown because too many files have changed in this diff Show More