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

Fix size hint for recent list of files on home tab w/unicode filenames

Browse Source
This commit is contained in:
David Capello 2017-03-09 17:40:02 -03:00
parent 52375f3aa9
commit 83874a4dd9
2 changed files with 34 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
data/themes/default/theme.xml
View File

@ -776,24 +776,6 @@
<icon part="tab_home_icon_active" />
</style>
<!-- recent_file -->
<style id="recent_file">
<background color="background" />
<text color="text" valign="middle" padding-left="2" padding-right="2" padding-top="3" padding-bottom="1" />
</style>
<style id="recent_file:hover">
<background color="menuitem_hot_face" />
</style>
<style id="recent_file:active">
<background color="listitem_selected_face" />
<text color="listitem_selected_text" />
</style>
<!-- recent_file_detail -->
<style id="recent_file_detail" base="recent_file">
<text color="disabled" valign="top" />
</style>
<!-- news_item -->
<style id="news_item">
<background color="background" />
@ -1052,6 +1034,18 @@
<background part="separator_vert" align="center" />
</style>
<style id="recent_item" />
<style id="recent_file" border="2">
<background color="background" />
<background color="menuitem_hot_face" state="mouse" />
<background color="listitem_selected_face" state="selected" />
<text color="text" align="left" x="2" /> <!-- padding-left="2" padding-right="2" padding-top="3" padding-bottom="1" -->
<text color="listitem_selected_text" align="left" x="2" state="selected" />
</style>
<style id="recent_file_detail" border="2" border-left="0" extends="recent_file">
<text color="disabled" align="left" x="2" />
</style>
</styles>
</theme>

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

@ -1,5 +1,5 @@
// Aseprite
// Copyright (C) 2001-2016 David Capello
// Copyright (C) 2001-2017 David Capello
//
// This program is distributed under the terms of
// the End-User License Agreement for Aseprite.
@ -16,7 +16,6 @@
#include "app/pref/preferences.h"
#include "app/recent_files.h"
#include "app/ui/skin/skin_theme.h"
#include "app/ui/skin/style.h"
#include "app/ui_context.h"
#include "base/bind.h"
#include "base/fs.h"
@ -40,19 +39,25 @@ using namespace skin;
class RecentFileItem : public LinkLabel {
public:
RecentFileItem(const std::string& file)
: LinkLabel(file)
: LinkLabel("")
, m_fullpath(file)
, m_name(base::get_file_name(file))
, m_path(base::get_file_path(file)) {
setStyle(SkinTheme::instance()->newStyles.recentItem());
}
protected:
void onSizeHint(SizeHintEvent& ev) override {
SkinTheme* theme = static_cast<SkinTheme*>(this->theme());
Style* style = theme->styles.recentFile();
Style* styleDetail = theme->styles.recentFileDetail();
Style::State state;
gfx::Size sz1 = style->sizeHint(m_name.c_str(), state);
gfx::Size sz2 = styleDetail->sizeHint(m_path.c_str(), state);
ui::Style* style = theme->newStyles.recentFile();
ui::Style* styleDetail = theme->newStyles.recentFileDetail();
setText(m_name);
gfx::Size sz1 = theme->calcSizeHint(this, style);
setText(m_path);
gfx::Size sz2 = theme->calcSizeHint(this, styleDetail);
ev.setSizeHint(gfx::Size(sz1.w+sz2.w, MAX(sz1.h, sz2.h)));
}
@ -60,30 +65,28 @@ protected:
SkinTheme* theme = static_cast<SkinTheme*>(this->theme());
Graphics* g = ev.graphics();
gfx::Rect bounds = clientBounds();
Style* style = theme->styles.recentFile();
Style* styleDetail = theme->styles.recentFileDetail();
ui::Style* style = theme->newStyles.recentFile();
ui::Style* styleDetail = theme->newStyles.recentFileDetail();
Style::State state;
if (hasMouse() && !manager()->getCapture()) state += Style::hover();
if (isSelected()) state += Style::active();
if (parent()->hasCapture()) state += Style::clicked();
style->paint(g, bounds, m_name.c_str(), state);
setText(m_name.c_str());
theme->paintWidget(g, this, style, bounds);
if (Preferences::instance().general.showFullPath()) {
gfx::Size textSize = style->sizeHint(m_name.c_str(), state);
gfx::Size textSize = theme->calcSizeHint(this, style);
gfx::Rect detailsBounds(
bounds.x+textSize.w, bounds.y,
bounds.w-textSize.w, bounds.h);
styleDetail->paint(g, detailsBounds, m_path.c_str(), state);
setText(m_path.c_str());
theme->paintWidget(g, this, styleDetail, detailsBounds);
}
}
void onClick() override {
static_cast<RecentListBox*>(parent())->onClick(text());
static_cast<RecentListBox*>(parent())->onClick(m_fullpath);
}
private:
std::string m_fullpath;
std::string m_name;
std::string m_path;
};