Commit112557b

committed

EngineSettings: Add property for setting WidgetLog padding

1 parent9a16a43 commit112557bCopy full SHA for 112557b

File tree

+13

-2

lines changed

+13

-2

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ Engine features:`
`41`	`41`	`* Support using gamepad during initial launch menus.`
`42`	`42`	`* Added prompt for language on first launch.`
`43`	`43`	`* Added 'show_permadeath' option to menus/gamenew.txt config.`
	`44`	`+* Added 'log.padding' property to engine/widget_settings.txt config.`
`44`	`45`	`* Android: Enabled use of external input devices (gamepads, keyboards, mice)`
`45`	`46`
`46`	`47`	`Engine fixes:`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1005,6 +1005,8 @@ void EngineSettings::Widgets::load() {`
`1005`	`1005`
`1006`	`1006`	`scrollbar_bg_color =Color(0,0,0,64);`
`1007`	`1007`
	`1008`	`+log_padding =4;`
	`1009`	`+`
`1008`	`1010`	`FileParser infile;`
`1009`	`1011`	`// @CLASS EngineSettings: Widgets\|Description of engine/widget_settings.txt`
`1010`	`1012`	`if (infile.open("engine/widget_settings.txt", FileParser::MOD_FILE, FileParser::ERROR_NONE)) {`
`@@ -1077,6 +1079,12 @@ void EngineSettings::Widgets::load() {`
`1077`	`1079`	`scrollbar_bg_color =Parse::toRGBA(infile.val);`
`1078`	`1080`	`}`
`1079`	`1081`	`}`
	`1082`	`+elseif (infile.section =="log") {`
	`1083`	`+if (infile.key =="padding") {`
	`1084`	`+// @ATTR log.padding\|int\|The padding in pixels of the log text area.`
	`1085`	`+log_padding =Parse::toInt(infile.val);`
	`1086`	`+}`
	`1087`	`+}`
`1080`	`1088`	`}`
`1081`	`1089`	`}`
`1082`	`1090`	`}`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -284,6 +284,7 @@ class EngineSettings {`
`284`	`284`	`Point listbox_text_margin;`
`285`	`285`	`int horizontal_list_text_width;`
`286`	`286`	`Color scrollbar_bg_color;`
	`287`	`+int log_padding;`
`287`	`288`	`};`
`288`	`289`
`289`	`290`	`classXPTable {`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ FLARE. If not, see http://www.gnu.org/licenses/`
`30`	`30`
`31`	`31`	`#include<SDL.h>`
`32`	`32`
`33`		`-VersionVersionInfo::ENGINE(1,14,193);`
	`33`	`+VersionVersionInfo::ENGINE(1,14,194);`
`34`	`34`	`VersionVersionInfo::MIN(0,0,0);`
`35`	`35`	`VersionVersionInfo::MAX(USHRT_MAX, USHRT_MAX, USHRT_MAX);`
`36`	`36`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ FLARE. If not, see http://www.gnu.org/licenses/`
`20`	`20`	`*/`
`21`	`21`
`22`	`22`	`#include"CommonIncludes.h"`
	`23`	`+#include"EngineSettings.h"`
`23`	`24`	`#include"FontEngine.h"`
`24`	`25`	`#include"MessageEngine.h"`
`25`	`26`	`#include"RenderDevice.h"`
`@@ -30,7 +31,7 @@ FLARE. If not, see http://www.gnu.org/licenses/`
`30`	`31`
`31`	`32`	`WidgetLog::WidgetLog (int width,int height)`
`32`	`33`	`: scroll_box(new WidgetScrollBox(width, height))`
`33`		`-, padding(4)`
	`34`	`+, padding(eset->widgets.log_padding)`
`34`	`35`	`, max_messages(MAX_MESSAGES)`
`35`	`36`	`, updated(false)`
`36`	`37`	`, next_color(font->getColor(FontEngine::COLOR_MENU_NORMAL))`

Comments

(0)