mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add text align to listbox

Browse Source
This commit is contained in:
Jinhao 2016-06-18 07:27:26 +08:00
parent 58d517d166
commit 9795299447
1 changed files with 70 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
source/gui/widgets/listbox.cpp
View File

@ -26,6 +26,8 @@
#include <nana/gui/layout_utility.hpp> #include <nana/gui/layout_utility.hpp>
#include <nana/gui/element.hpp> #include <nana/gui/element.hpp>
#include <nana/paint/text_renderer.hpp>
#include <list> #include <list>
#include <deque> #include <deque>
#include <stdexcept> #include <stdexcept>
@ -2959,34 +2961,47 @@ namespace nana
const unsigned height = r.height - 1; const unsigned height = r.height - 1;
const int bottom_y = r.bottom() - 2; const int bottom_y = r.bottom() - 2;
rectangle column_r{
#ifdef USE_OFFSET_X #ifdef USE_OFFSET_X
int x = r.x - essence_->scroll.offset_x; r.x - essence_->scroll.offset_x,
#else #else
int x = r.x - static_cast<int>(essence_->scroll.x_offset()); r.x - static_cast<int>(essence_->scroll.x_offset()),
#endif #endif
r.y,
0, r.height - 1
};
for (auto & col : essence_->header.cont()) for (auto & col : essence_->header.cont())
{ {
if (col.visible_state) if (col.visible_state)
{ {
int next_x = x + static_cast<int>(col.width_px); column_r.width = col.width_px;
if (next_x > r.x)
const auto right_pos = column_r.right();
//Make sure the column is in the display area.
if (right_pos > r.x)
{ {
_m_draw_header_item(graph, x, r.y, height, text_top, text_color, col, (col.index == essence_->pointer_where.second ? state : item_state::normal)); _m_draw_header_item(graph, column_r, text_top, text_color, col, (col.index == essence_->pointer_where.second ? state : item_state::normal));
graph.line({ next_x - 1, r.y }, { next_x - 1, bottom_y }, _m_border_color()); graph.line({ right_pos - 1, r.y }, { right_pos - 1, bottom_y }, _m_border_color());
} }
x = next_x; column_r.x = right_pos;
if (x > r.right()) if (right_pos > r.right())
break; break;
} }
} }
if (x < r.right()) //If the last rendered column's right is less than r.right, fill the spare space.
graph.rectangle({ x, r.y, static_cast<unsigned>(r.right() - x), height }, true, essence_->scheme_ptr->header_bgcolor); if (column_r.x < r.right())
{
column_r.width = (r.right() - column_r.x);
graph.rectangle(column_r, true, essence_->scheme_ptr->header_bgcolor);
}
const int y = r.y + r.height - 1; const int y = r.bottom() - 1;
graph.line({ r.x, y }, { r.x + static_cast<int>(r.width), y }, _m_border_color()); graph.line({ r.x, y }, { r.right(), y }, _m_border_color());
if (options_.grab_column) if (options_.grab_column)
{ {
@ -3048,8 +3063,7 @@ namespace nana
return npos; return npos;
} }
template<typename Item> void _m_draw_header_item(graph_reference graph, const rectangle& column_r, int text_top, const ::nana::color& fgcolor, const es_header::column& column, item_state state)
void _m_draw_header_item(graph_reference graph, int x, int y, unsigned height, int txtop, const ::nana::color& fgcolor, const Item& item, item_state state)
{ {
::nana::color bgcolor; ::nana::color bgcolor;
switch(state) switch(state)
@ -3061,14 +3075,31 @@ namespace nana
case item_state::floated: bgcolor = essence_->scheme_ptr->header_floated.get_color(); break; case item_state::floated: bgcolor = essence_->scheme_ptr->header_floated.get_color(); break;
} }
graph.gradual_rectangle({ x, y, item.width_px, height }, bgcolor.blend(colors::white, 0.9), bgcolor.blend(colors::black, 0.9), true); graph.gradual_rectangle(column_r, bgcolor.blend(colors::white, 0.9), bgcolor.blend(colors::black, 0.9), true);
graph.string({ x + static_cast<int>(essence_->scheme_ptr->text_margin), txtop }, item.text, fgcolor);
if(item.index == essence_->lister.sort_index()) paint::aligner text_aligner{ graph, column.alignment, column.alignment };
auto text_margin = essence_->scheme_ptr->text_margin;
if (text_margin < column_r.width)
{
graph.palette(true, fgcolor);
point text_pos{ column_r.x, text_top };
if (align::left == column.alignment)
text_pos.x += text_margin;
else if (align::center == column.alignment)
text_margin = 0;
text_aligner.draw(column.text, text_pos, column_r.width - text_margin);
}
if (column.index == essence_->lister.sort_index())
{ {
facade<element::arrow> arrow("hollow_triangle"); facade<element::arrow> arrow("hollow_triangle");
arrow.direction(essence_->lister.sort_reverse() ? ::nana::direction::south : ::nana::direction::north); arrow.direction(essence_->lister.sort_reverse() ? ::nana::direction::south : ::nana::direction::north);
arrow.draw(graph, {}, colors::black, { x + (static_cast<int>(item.width_px) - 16) / 2, -4, 16, 16 }, element_state::normal); // geometric scheme? arrow.draw(graph, {}, colors::black, { column_r.x + (static_cast<int>(column_r.width) - 16) / 2, -4, 16, 16 }, element_state::normal); // geometric scheme?
} }
} }
@ -3079,10 +3110,10 @@ namespace nana
nana::paint::graphics ext_graph({ col.width_px, essence_->scheme_ptr->header_height }); nana::paint::graphics ext_graph({ col.width_px, essence_->scheme_ptr->header_height });
ext_graph.typeface(essence_->graph->typeface()); ext_graph.typeface(essence_->graph->typeface());
int txtop = (essence_->scheme_ptr->header_height - essence_->scheme_ptr->text_height) / 2; int text_top = (essence_->scheme_ptr->header_height - essence_->scheme_ptr->text_height) / 2;
_m_draw_header_item(ext_graph, 0, 0, essence_->scheme_ptr->header_height, txtop, colors::white, col, item_state::floated); _m_draw_header_item(ext_graph, rectangle{ext_graph.size()}, text_top, colors::white, col, item_state::floated);
auto xpos = essence_->header.position(col.index, nullptr) + pos.x - ref_xpos_; auto xpos = essence_->header.position(col.index, nullptr) + pos.x - grabs_.start_pos;
#ifdef USE_OFFSET_X #ifdef USE_OFFSET_X
ext_graph.blend(rectangle{ ext_graph.size() }, *(essence_->graph), nana::point(xpos - essence_->scroll.offset_x + rect.x, rect.y), 0.5); ext_graph.blend(rectangle{ ext_graph.size() }, *(essence_->graph), nana::point(xpos - essence_->scroll.offset_x + rect.x, rect.y), 0.5);
@ -3340,8 +3371,7 @@ namespace nana
//draw the background for the whole item //draw the background for the whole item
graph->rectangle(rectangle{ content_r.x, y, show_w, essence_->scheme_ptr->item_height }, true, bgcolor); graph->rectangle(rectangle{ content_r.x, y, show_w, essence_->scheme_ptr->item_height }, true, bgcolor);
int item_xpos = x; int column_x = x;
int extreme_text = x;
for (size_type display_order{ 0 }; display_order < seqs.size(); ++display_order) // get the cell (column) index in the order headers are displayed for (size_type display_order{ 0 }; display_order < seqs.size(); ++display_order) // get the cell (column) index in the order headers are displayed
{ {
@ -3351,7 +3381,7 @@ namespace nana
if (col.width_px > essence_->scheme_ptr->text_margin) if (col.width_px > essence_->scheme_ptr->text_margin)
{ {
int content_pos = essence_->scheme_ptr->text_margin; int content_pos = 0;
//Draw the image in the 1st column in display order //Draw the image in the 1st column in display order
if (0 == display_order) if (0 == display_order)
@ -3375,7 +3405,7 @@ namespace nana
using state = facade<element::crook>::state; using state = facade<element::crook>::state;
crook_renderer_.check(item.flags.checked ? state::checked : state::unchecked); crook_renderer_.check(item.flags.checked ? state::checked : state::unchecked);
crook_renderer_.draw(*graph, bgcolor, fgcolor, essence_->checkarea(item_xpos, y), estate); crook_renderer_.draw(*graph, bgcolor, fgcolor, essence_->checkarea(column_x, y), estate);
} }
if (essence_->if_image) if (essence_->if_image)
@ -3384,7 +3414,7 @@ namespace nana
if (item.img) if (item.img)
{ {
nana::rectangle img_r(item.img_show_size); nana::rectangle img_r(item.img_show_size);
img_r.x = content_pos + item_xpos + (16 - static_cast<int>(item.img_show_size.width)) / 2; // center in 16 - geom scheme? img_r.x = content_pos + column_x + (16 - static_cast<int>(item.img_show_size.width)) / 2; // center in 16 - geom scheme?
img_r.y = y + (static_cast<int>(essence_->scheme_ptr->item_height) - static_cast<int>(item.img_show_size.height)) / 2; // center img_r.y = y + (static_cast<int>(essence_->scheme_ptr->item_height) - static_cast<int>(item.img_show_size.height)) / 2; // center
item.img.stretch(rectangle{ item.img.size() }, *graph, img_r); item.img.stretch(rectangle{ item.img.size() }, *graph, img_r);
} }
@ -3394,14 +3424,14 @@ namespace nana
bool draw_column = true; bool draw_column = true;
if ( content_pos < static_cast<int>(col.width_px)) // we have room if ( content_pos + essence_->scheme_ptr->text_margin < static_cast<int>(col.width_px)) // we have room
{ {
auto inline_wdg = _m_get_inline_pane(cat, column_pos); auto inline_wdg = _m_get_inline_pane(cat, column_pos);
if (inline_wdg) if (inline_wdg)
{ {
//Make sure the user-define inline widgets in right visible rectangle. //Make sure the user-define inline widgets in right visible rectangle.
rectangle pane_r; rectangle pane_r;
auto wdg_x = item_xpos + content_pos; auto wdg_x = column_x + content_pos;
auto wdg_w = col.width_px - static_cast<unsigned>(content_pos); auto wdg_w = col.width_px - static_cast<unsigned>(content_pos);
bool visible_state = true; bool visible_state = true;
@ -3467,47 +3497,32 @@ namespace nana
if (item_state::highlighted == state) if (item_state::highlighted == state)
it_bgcolor = it_bgcolor.blend(static_cast<color_rgb>(0x99defd), 0.8); it_bgcolor = it_bgcolor.blend(static_cast<color_rgb>(0x99defd), 0.8);
graph->rectangle(rectangle{ item_xpos, y, col.width_px, essence_->scheme_ptr->item_height }, true, it_bgcolor); graph->rectangle(rectangle{ column_x, y, col.width_px, essence_->scheme_ptr->item_height }, true, it_bgcolor);
cell_txtcolor = m_cell.custom_format->fgcolor; cell_txtcolor = m_cell.custom_format->fgcolor;
} }
if (draw_column) if (draw_column)
{ {
graph->string(point{ item_xpos + content_pos, y + txtoff }, m_cell.text, cell_txtcolor); // draw full text of the cell index (column) paint::aligner text_aligner{*graph, col.alignment};
int item_right = item_xpos + col.width_px; unsigned text_margin_right = 0;
int text_right = item_xpos + content_pos + ts.width; if (align::left == col.alignment)
int excess = text_right - item_right ; content_pos += essence_->scheme_ptr->text_margin;
if (excess > 0) // it was an excess else if (align::right == col.alignment)
{ text_margin_right = essence_->scheme_ptr->text_margin;
//The text is painted over the next subitem // here beging the ...
int xpos = item_right - static_cast<int>(essence_->scheme_ptr->suspension_width);
// litter rect with the item bg end ... graph->palette(true, cell_txtcolor);
graph->rectangle(rectangle{ xpos, y /*+ 2*/, essence_->scheme_ptr->suspension_width, essence_->scheme_ptr->item_height /*- 4*/ }, true, it_bgcolor); text_aligner.draw(m_cell.text, { column_x + content_pos, y + txtoff }, col.width_px - content_pos - text_margin_right);
graph->string(point{ xpos, y /*+ 2*/ }, L"...");
//Erase the part that over the next subitem only if the right of column is less than right of listbox
if (item_right < content_r.right() )
{
graph->palette(false, bgcolor); // we need to erase the excess, because some cell may not draw text over
graph->rectangle(rectangle( item_right, y /*+ 2*/, excess, essence_->scheme_ptr->item_height /*- 4*/ ), true);
}
extreme_text = (std::max)(extreme_text, text_right);
}
} }
} }
graph->line({ item_xpos - 1, y }, { item_xpos - 1, y + static_cast<int>(essence_->scheme_ptr->item_height) - 1 }, static_cast<color_rgb>(0xEBF4F9)); graph->line({ column_x - 1, y }, { column_x - 1, y + static_cast<int>(essence_->scheme_ptr->item_height) - 1 }, static_cast<color_rgb>(0xEBF4F9));
} }
item_xpos += col.width_px; column_x += col.width_px;
if (display_order + 1 >= seqs.size() && extreme_text > item_xpos)
{
graph->rectangle(rectangle(item_xpos , y /*+ 2*/, extreme_text - item_xpos, essence_->scheme_ptr->item_height /*- 4*/), true, item.bgcolor);
}
} }
//Draw selecting inner rectangle //Draw selecting inner rectangle