Patch level : 10.0
Files correlati : ba0.exe Ricompilazione Demo : [ ] Commento : Diminuiti tempi di attesa per rientro da applicazione in menu explorer git-svn-id: svn://10.65.10.50/trunk@19501 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
parent
109c64286f
commit
c6b154d19f
@ -2172,7 +2172,6 @@ int ba0100(int argc, char** argv)
|
||||
}
|
||||
|
||||
TFilename menu = (argc < 2) ? MEN_FILE : argv[1];
|
||||
|
||||
if (menu.custom_path())
|
||||
{
|
||||
TMenu_application *ma = new TMenu_application(menu);
|
||||
|
@ -495,12 +495,12 @@ void TMenulist_window::draw_item(int i)
|
||||
{
|
||||
if (i < 0 && i >= _sorted.items())
|
||||
return; // Scarta elementi non validi
|
||||
|
||||
RCT rct; xvt_vobj_get_client_rect(win(), &rct);
|
||||
WINDOW w = win();
|
||||
RCT rct; xvt_vobj_get_client_rect(w, &rct);
|
||||
const int width = rct.right - rct.left;
|
||||
const int height = rct.bottom - rct.top;
|
||||
|
||||
xvtil_set_font(win(), NULL, 0, 0); // Set default font
|
||||
xvtil_set_font(w, NULL, 0, 0); // Set default font
|
||||
set_opaque_text(TRUE);
|
||||
|
||||
const TMenuitem& item = (const TMenuitem&)_sorted[i];
|
||||
@ -529,13 +529,13 @@ void TMenulist_window::draw_item(int i)
|
||||
const int iy = top+2;
|
||||
if (item.is_submenu())
|
||||
{
|
||||
xvt_dwin_draw_icon(win(), ix, iy, 10202);
|
||||
xvt_dwin_draw_icon(w, ix, iy, 10202);
|
||||
if (ico > 0)
|
||||
xvt_dwin_draw_icon(win(), ix, iy+4, ico);
|
||||
xvt_dwin_draw_icon(w, ix, iy+4, ico);
|
||||
}
|
||||
else
|
||||
{
|
||||
xvt_dwin_draw_icon(win(), ix, iy, ico > 0 ? ico : ICON_RSRC);
|
||||
xvt_dwin_draw_icon(w, ix, iy, ico > 0 ? ico : ICON_RSRC);
|
||||
}
|
||||
|
||||
TString80 str = item.caption();
|
||||
@ -544,7 +544,7 @@ void TMenulist_window::draw_item(int i)
|
||||
|
||||
// const int maxchars = (right-left)/CHARX - 1;
|
||||
int maxchars = 24;
|
||||
const int ll = xvt_dwin_get_text_width(win(), str, -1);
|
||||
const int ll = xvt_dwin_get_text_width(w, str, -1);
|
||||
if (ll >= (right-left))
|
||||
maxchars = (right-left) * str.len() / ll - 1;
|
||||
|
||||
@ -552,13 +552,16 @@ void TMenulist_window::draw_item(int i)
|
||||
int y = iy + 32 + CHARY-1;
|
||||
FOR_EACH_TOKEN(para, line)
|
||||
{
|
||||
const int ll = xvt_dwin_get_text_width(win(), line, -1);
|
||||
const int ll = xvt_dwin_get_text_width(w, line, -1);
|
||||
const int x = cx - ll/2;
|
||||
xvt_dwin_draw_text(win(), x, y, line, -1);
|
||||
xvt_dwin_draw_text(w, x, y, line, -1);
|
||||
y += CHARY-2;
|
||||
}
|
||||
if (item.disabled())
|
||||
xvt_dwin_draw_icon(win(), ix+4, iy+4, 10203); // Stop icon
|
||||
{
|
||||
RCT rct; xvt_rect_set(&rct, ix+16, iy+16, ix+32, iy+32);
|
||||
xvt_dwin_draw_icon_rect(w, &rct, 10203); // Stop icon
|
||||
}
|
||||
}
|
||||
|
||||
//scrive la voce di menu corrente a video
|
||||
|
@ -94,7 +94,7 @@ long TApp_window::handler(WINDOW win, EVENT* ep)
|
||||
TApp_window::TApp_window(TBook_window* owner, const char* appname) : _owner(owner), _appname(appname)
|
||||
{
|
||||
WINDOW w = create(0, 0, -1, -1, __MAGIC_CAPTION__, WSF_NONE, W_PLAIN, owner->notebook());
|
||||
xvt_timer_create(w, 1500); // Ogni tanto controllo se l'applicazione e' ancora viva
|
||||
xvt_timer_create(w, 1000); // Ogni tanto controllo se l'applicazione e' ancora viva
|
||||
}
|
||||
|
||||
TApp_window::~TApp_window()
|
||||
|
Loading…
x
Reference in New Issue
Block a user