Skip to content

Commit 6723b1d

Browse files
committed
Remove modal dialog message header in favor to window header
1 parent ed4b86f commit 6723b1d

File tree

1 file changed

+3
-10
lines changed

1 file changed

+3
-10
lines changed

Widgets/ModalDialog.c

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ extern "C" {
3636

3737
static xWindow *xThisWnd;
3838

39-
static xLabel *xMessageHeader;
4039
static xLabel *xMessage;
4140
//static xProgressBar *xPBar;
4241
static xMenuButton *xButtons[MODAL_DIALOG_MAX_BUTTONS]; // y(ok)/n/c Ìàêñèìóì â äèàëîãå âèäíî 4 êíîïêè.
@@ -86,7 +85,7 @@ extern "C" {
8685
vWidgetHide(xButtons[c]);
8786
}
8887

89-
pcLabelSetText(xMessageHeader, "");
88+
vWindowSetHeader(xThisWnd, "");
9089
pcLabelSetText(xMessage, "");
9190
//vWidgetHide(xPBar);
9291
}
@@ -146,15 +145,9 @@ extern "C" {
146145
vWindowSetOnCloseHandler(xThisWnd, prvOnCloseHandler);
147146
vWindowSetOnCloseRequestHandler(xThisWnd, prvOnCloseRequestHandler);
148147

149-
xMessageHeader = pxLabelCreate(0, 0, usWidgetGetW(xThisWnd), usStatusBarGetH(), "ModalDialogHeader", FONT_ASCII_16_X, 0, xThisWnd);
150-
vWidgetSetBgColor(xMessageHeader, ColorMessageHeaderBackground, false);
151-
vLabelSetTextAlign(xMessageHeader, LABEL_ALIGN_CENTER);
152-
vLabelSetVerticalAlign(xMessageHeader, LABEL_ALIGN_MIDDLE);
153-
vLabelSetTextColor(xMessageHeader, ColorMessageHeaderText);
154-
155148
usY = (usInterfaceGetWindowH() * 4) / 10 - usStatusBarGetH();
156149

157-
xMessage = pxLabelCreate(0, usWidgetGetH(xMessageHeader), usWidgetGetW(xThisWnd), usY, "ModalDialogText", FONT_ASCII_16_X, MODAL_DIALOG_MAX_MSG_LENGTH, xThisWnd);
150+
xMessage = pxLabelCreate(0, 0, usWidgetGetW(xThisWnd), usY, "ModalDialogText", FONT_ASCII_16_X, MODAL_DIALOG_MAX_MSG_LENGTH, xThisWnd);
158151
bLabelSetMultiline(xMessage, true);
159152
vLabelSetTextAlign(xMessage, LABEL_ALIGN_CENTER);
160153
vLabelSetVerticalAlign(xMessage, LABEL_ALIGN_MIDDLE);
@@ -243,7 +236,7 @@ extern "C" {
243236
usY = usWidgetGetY0(xButtons[0], false);
244237
usX = betweenBtnsX;
245238

246-
pcLabelSetText(xMessageHeader, xDlg->sHdr);
239+
vWindowSetHeader(xThisWnd, xDlg->sHdr);
247240
pcLabelSetText(xMessage, xDlg->sMsg);
248241

249242
prvShowPB(xDlg);

0 commit comments

Comments
 (0)