Fix merge: Hab UI.

pull/1/head
John Greb 2015-05-15 23:55:32 +01:00
rodzic 453706a94f
commit f8a5b985e9
2 zmienionych plików z 10 dodań i 4 usunięć

Wyświetl plik

@ -3317,10 +3317,8 @@ static bool restore_minimize = false;
void UI_select_central_frame(int y, int ht)
{
#if 0
if (bHAB)
return;
#endif
text_panel->resize(0, y, fl_digi_main->w(), ht);
center_group->init_sizes();
}

Wyświetl plik

@ -236,7 +236,7 @@ void status::saveLastState()
logbook_col_5 = wBrowser->columnWidth(5);
if (!bWF_only) {
if (!bWF_only && !bHAB) {
RxTextHeight = (ReceiveText->h() * 100) / text_panel->h();//VTgroup->h();
quick_entry = ReceiveText->get_quick_entry();
rx_scroll_hints = ReceiveText->get_scroll_hints();
@ -852,7 +852,15 @@ void status::initLastState()
if (bWF_only)
fl_digi_main->resize(mainX, mainY, mainW, Hmenu + Hwfall + Hstatus);
else {
else if (bHAB) {
if (HAB_width < 0)
HAB_width = Fl::w();
if (HAB_width < WMIN_hab)
HAB_width = WMIN_hab;
if (HAB_width > Fl::w())
HAB_width = Fl::w();
fl_digi_main->resize(mainX, mainY, HAB_width, HAB_height);
} else {
fl_digi_main->resize(mainX, mainY, mainW, mainH);
set_macroLabels();