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

Merge branch 'qPCR4vir-hotfixes-1.0.1' into hotfixes-1.0.1

Browse Source
This commit is contained in:
Jinhao 2015-03-20 12:32:20 +08:00
commit 75af5554a4
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/nana/basic_types.hpp
View File

@ -282,7 +282,7 @@ namespace nana
//temporary defintions, these will be replaced by color schema //temporary defintions, these will be replaced by color schema
button_face_shadow_start = 0xF5F4F2, button_face_shadow_start = 0xF5F4F2,
button_face_shadow_end = 0xD5D2CA, button_face_shadow_end = 0xD5D2CA,
button_face = 0xD4D0C8, button_face = 0xD4D0C8 , //,light_cyan
dark_border = 0x404040, dark_border = 0x404040,
gray_border = 0x808080, gray_border = 0x808080,
highlight = 0x1CC4F7 highlight = 0x1CC4F7

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

@ -2613,6 +2613,8 @@ namespace nana
for(auto index : seqs) for(auto index : seqs)
{ {
const auto & header = essence_->header.column(index); const auto & header = essence_->header.column(index);
auto it_bgcolor = bgcolor;
//auto it_fgcolor = fgcolor;
if ((item.cells.size() > index) && (header.pixels > 5)) if ((item.cells.size() > index) && (header.pixels > 5))
{ {
@ -2622,14 +2624,14 @@ namespace nana
if (m_cell.custom_format && (!m_cell.custom_format->bgcolor.invisible())) if (m_cell.custom_format && (!m_cell.custom_format->bgcolor.invisible()))
{ {
if (!item.flags.selected) it_bgcolor = m_cell.custom_format->bgcolor;
{ if (item.flags.selected)
it_bgcolor = it_bgcolor.blend( bgcolor , 0.5) ;
if (item_state::highlighted == state) if (item_state::highlighted == state)
graph->set_color(m_cell.custom_format->bgcolor.blend(::nana::color(0x99, 0xde, 0xfd), 0.8)); it_bgcolor = it_bgcolor.blend(::nana::color(0x99, 0xde, 0xfd), 0.8);
else
graph->set_color(m_cell.custom_format->bgcolor); graph->set_color(it_bgcolor);
graph->rectangle(rectangle{ item_xpos, y, header.pixels, essence_->item_size }, true); graph->rectangle(rectangle{ item_xpos, y, header.pixels, essence_->item_size }, true);
}
cell_txtcolor = m_cell.custom_format->fgcolor; cell_txtcolor = m_cell.custom_format->fgcolor;
} }
@ -2677,15 +2679,17 @@ namespace nana
//The text is painted over the next subitem //The text is painted over the next subitem
int xpos = item_xpos + header.pixels - essence_->suspension_width; int xpos = item_xpos + header.pixels - essence_->suspension_width;
graph->set_color(bgcolor); graph->set_color(it_bgcolor);
graph->rectangle(rectangle{ xpos, y + 2, essence_->suspension_width, essence_->item_size - 4 }, true); graph->rectangle(rectangle{ xpos, y + 2, essence_->suspension_width, essence_->item_size - 4 }, true);
graph->set_text_color(fgcolor); graph->set_text_color(cell_txtcolor);
graph->string(point{ xpos, y + 2 }, STR("...")); graph->string(point{ xpos, y + 2 }, STR("..."));
//Erase the part that over the next subitem. //Erase the part that over the next subitem.
if (index + 1 >= seqs.size()) if (index + 1 <= seqs.size())
graph->set_color(item.bgcolor); {
graph->set_color(bgcolor);
graph->rectangle(rectangle{item_xpos + static_cast<int>(header.pixels), y + 2, ts.width + ext_w - header.pixels, essence_->item_size - 4}, true); graph->rectangle(rectangle{item_xpos + static_cast<int>(header.pixels), y + 2, ts.width + ext_w - header.pixels, essence_->item_size - 4}, true);
}
} }
} }