fujin/rtorrent
1
0
Fork 0
mirror of https://github.com/rakshasa/rtorrent.git synced 2026-08-14 14:12:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some compile issues.

Browse Source
This commit is contained in:
Jari Sundell
2011-11-22 16:46:59 +09:00
parent 9507bd82f4
commit e11be5cdbe
6 changed files with 39 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/display/frame.cc
+13 -7
View File
@@ -38,6 +38,7 @@
#include <algorithm>
#include <functional>
#include <tr1/functional>
#include <rak/algorithm.h>
#include <torrent/exceptions.h>
@@ -332,6 +333,9 @@ Frame::balance_window(uint32_t x, uint32_t y, uint32_t width, uint32_t height) {
m_window->mark_dirty();
}
inline Frame::extent_type dynamic_min_height(const Frame::dynamic_type& value) { return value.second.min_height(); }
inline Frame::extent_type dynamic_min_width(const Frame::dynamic_type& value) { return value.second.min_width(); }
inline void
Frame::balance_row(uint32_t x, uint32_t y, uint32_t width, uint32_t height) {
// Find the size of the static frames. The dynamic frames are added
@@ -355,16 +359,17 @@ Frame::balance_row(uint32_t x, uint32_t y, uint32_t width, uint32_t height) {
remaining -= bounds.minHeight;
}
}
// Sort the dynamic frames by the min size in the direction we are
// interested in. Then try to satisfy the largest first, and if we
// have any remaining space we can use that to extend it and any
// following frames.
//
// Else if we're short, only give each what they require.
std::sort(dynamicFrames, dynamicFrames + dynamicSize,
rak::greater2(rak::on(rak::const_mem_ref(&dynamic_type::second), rak::const_mem_ref(&Frame::bounds_type::minHeight)),
rak::on(rak::const_mem_ref(&dynamic_type::second), rak::const_mem_ref(&Frame::bounds_type::minHeight))));
std::stable_sort(dynamicFrames, dynamicFrames + dynamicSize,
std::tr1::bind(std::greater<extent_type>(),
std::tr1::bind(&dynamic_min_height, std::tr1::placeholders::_1),
std::tr1::bind(&dynamic_min_height, std::tr1::placeholders::_2)));
bool retry;
@@ -436,9 +441,10 @@ Frame::balance_column(uint32_t x, uint32_t y, uint32_t width, uint32_t height) {
// following frames.
//
// Else if we're short, only give each what they require.
std::sort(dynamicFrames, dynamicFrames + dynamicSize,
rak::greater2(rak::on(rak::const_mem_ref(&dynamic_type::second), rak::const_mem_ref(&Frame::bounds_type::minWidth)),
rak::on(rak::const_mem_ref(&dynamic_type::second), rak::const_mem_ref(&Frame::bounds_type::minWidth))));
std::stable_sort(dynamicFrames, dynamicFrames + dynamicSize,
std::tr1::bind(std::greater<extent_type>(),
std::tr1::bind(&dynamic_min_width, std::tr1::placeholders::_1),
std::tr1::bind(&dynamic_min_width, std::tr1::placeholders::_2)));
bool retry;