From e9a668407c866eac349a34ebf952dab2f0ff4793 Mon Sep 17 00:00:00 2001 From: Vadim Lopatin Date: Fri, 27 Mar 2015 14:10:19 +0300 Subject: [PATCH] fix log window size issue #48 --- dlangide.visualdproj | 2 +- src/dlangide/ui/frame.d | 19 ++----------------- src/dlangide/ui/outputpanel.d | 3 +++ src/dlangide/ui/searchPanel.d | 2 +- 4 files changed, 7 insertions(+), 19 deletions(-) diff --git a/dlangide.visualdproj b/dlangide.visualdproj index 814b46c..2a09fda 100644 --- a/dlangide.visualdproj +++ b/dlangide.visualdproj @@ -72,7 +72,7 @@ 0 DebugInfo DCD 0 - Unicode USE_FREETYPE USE_OPENGL USE_SDL + Unicode USE_FREETYPE USE_OPENGL 0 3 0 diff --git a/src/dlangide/ui/frame.d b/src/dlangide/ui/frame.d index a37f53f..d2a9d8f 100644 --- a/src/dlangide/ui/frame.d +++ b/src/dlangide/ui/frame.d @@ -553,9 +553,8 @@ class IDEFrame : AppFrame { window.close(); return true; case IDEActions.HelpAbout: - Window wnd = Platform.instance.createWindow("About...", window, WindowFlag.Modal); - wnd.mainWidget = createAboutWidget(); - wnd.show(); + window.showMessageBox(UIString("About DlangIDE"d), + UIString("DLangIDE\n(C) Vadim Lopatin, 2014\nhttp://github.com/buggins/dlangide\nIDE for D programming language written in D\nUses DlangUI library for GUI"d)); return true; case StandardAction.OpenUrl: platform.openURL(a.stringParam); @@ -820,17 +819,3 @@ class IDEFrame : AppFrame { } } -Widget createAboutWidget() -{ - LinearLayout res = new VerticalLayout(); - res.padding(Rect(10,10,10,10)); - res.addChild(new MultilineTextWidget(null, "DLangIDE\n(C) Vadim Lopatin, 2014\nhttp://github.com/buggins/dlangide\nIDE for D programming language written in D\nUses DlangUI library for GUI"d)); - Button closeButton = new Button("close", "Close"d); - closeButton.onClickListener = delegate(Widget src) { - Log.i("Closing window"); - res.window.close(); - return true; - }; - res.addChild(closeButton); - return res; -} diff --git a/src/dlangide/ui/outputpanel.d b/src/dlangide/ui/outputpanel.d index 7ef7fd3..4894572 100644 --- a/src/dlangide/ui/outputpanel.d +++ b/src/dlangide/ui/outputpanel.d @@ -137,9 +137,12 @@ class OutputPanel : DockWindow { } override protected Widget createBodyWidget() { + layoutWidth(FILL_PARENT).layoutHeight(FILL_PARENT); _tabs = new TabWidget("OutputPanelTabs", Align.Bottom); //_tabs.setStyles(STYLE_DOCK_HOST_BODY, STYLE_TAB_UP_DARK, STYLE_TAB_UP_BUTTON_DARK, STYLE_TAB_UP_BUTTON_DARK_TEXT); _tabs.setStyles(null, STYLE_TAB_DOWN_DARK, STYLE_TAB_DOWN_BUTTON_DARK, STYLE_TAB_UP_BUTTON_DARK_TEXT); + _tabs.layoutWidth(FILL_PARENT).layoutHeight(FILL_PARENT); + _tabs.tabHost.layoutWidth(FILL_PARENT).layoutHeight(FILL_PARENT); _logWidget = new CompilerLogWidget("logwidget"); _logWidget.readOnly = true; diff --git a/src/dlangide/ui/searchPanel.d b/src/dlangide/ui/searchPanel.d index 74f9906..b2e9123 100644 --- a/src/dlangide/ui/searchPanel.d +++ b/src/dlangide/ui/searchPanel.d @@ -130,7 +130,7 @@ struct SearchMatch { long col; dstring lineContent; } - + struct SearchMatchList { string filename; SearchMatch[] matches;