[Widelands-dev] [Merge] lp:~widelands-dev/widelands/font_size-lua into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/font_size-lua into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/font_size-lua/+merge/366938 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/font_size-lua. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/font_size-lua into lp:widelands
Continuous integration builds have changed state: Travis build 5055. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/537329044. Appveyor build 4835. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_font_size_lua-4835. -- https://code.launchpad.net/~widelands-dev/widelands/font_size-lua/+merge/366938 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/font_size-lua. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/font_size-lua into lp:widelands
Thanks a lot for the review! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/font_size-lua/+merge/366938 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/font_size-lua. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/font_size-lua into lp:widelands
Review: Approve LGTM :) -- https://code.launchpad.net/~widelands-dev/widelands/font_size-lua/+merge/366938 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/font_size-lua. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/font_size-lua into lp:widelands
That one fell victim to a merge conflict. I have added the style now :) -- https://code.launchpad.net/~widelands-dev/widelands/font_size-lua/+merge/366938 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/font_size-lua into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/font_size-lua into lp:widelands
=== modified file 'src/ui_fsmenu/internet_lobby.cc'
--- src/ui_fsmenu/internet_lobby.cc 2019-05-13 06:04:34 +
+++ src/ui_fsmenu/internet_lobby.cc 2019-05-15 08:36:30 +
@@ -296,6 +296,8 @@
case kClientSuperuser:
pic =
g_gr->images().get("images/wui/overlays/roadb_green.png");
er.set_picture(0, pic);
+ er.set_color(RGBColor(0, 255, 0));
+ er.set_picture(0, pic);
break;
case kClientIRC:
// No icon for IRC users
--
https://code.launchpad.net/~widelands-dev/widelands/font_size-lua/+merge/366938
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/font_size-lua into lp:widelands.
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/font_size-lua into lp:widelands
In trunk admins are written in green in the client list. Did you remove this on purpose? If not, I'm going to post the patch the next comment, -- https://code.launchpad.net/~widelands-dev/widelands/font_size-lua/+merge/366938 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/font_size-lua into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/font_size-lua into lp:widelands
Good idea. I'd also like each player name to have the respective player's color, but this will need changing of the chat message protocol, because we only have 1 of the 2 player colors available there. So, not in this branch. > On more question. We have 2 different fonts now. The one used in editboxes is > completely different from the other font. Is this intentionally? It's the same font. The only difference is that it's not bold. I think it looks better if we use bold fonts only for headings etc. -- https://code.launchpad.net/~widelands-dev/widelands/font_size-lua/+merge/366938 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/font_size-lua into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/font_size-lua into lp:widelands
And one more. This is the handling of direct messages. I know this is branch is about fonts but maybe we can address this here. Do we need: sender @recepiant: text For direct messages? The name is already coloured green and the text italic. This differentiates the message more than enough from normal messages IMHO. For the sender: @recepiant: text For the recipient: sender: text This should be sufficient, IMHO. -- https://code.launchpad.net/~widelands-dev/widelands/font_size-lua/+merge/366938 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/font_size-lua into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/font_size-lua into lp:widelands
On more question. We have 2 different fonts now. The one used in editboxes is completely different from the other font. Is this intentionally? -- https://code.launchpad.net/~widelands-dev/widelands/font_size-lua/+merge/366938 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/font_size-lua into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/font_size-lua into lp:widelands
- The text in the input box is not centred (q,g, j and so on are cut off) Thanks for the fix. The whole alignment code in the editbox should be overhauled sometime. - Private messages double the prefix Fixed - The @ in private message shouldn't be underlined Fixed - There should either be no space before the @ in private messages or an additional behind the @ (as it is b20) I did that on purpose. Mentions on Twitter and lots of modern messageboards etc. are always "@username", never "@ username". No space before the @ would make it too hard to read- - If we have the space it should not be underlined Fixed - The Username and the message look a little of (The message seems to be 2-4 pixels to high) That's https://bugs.launchpad.net/widelands/+bug/1827544 and out of scope for this branch -- https://code.launchpad.net/~widelands-dev/widelands/font_size-lua/+merge/366938 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/font_size-lua into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/font_size-lua into lp:widelands
Continuous integration builds have changed state: Travis build 4953. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/531353166. Appveyor build 4734. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_font_size_lua-4734. -- https://code.launchpad.net/~widelands-dev/widelands/font_size-lua/+merge/366938 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/font_size-lua into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/font_size-lua into lp:widelands
=== modified file 'src/wui/game_chat_panel.cc'
--- src/wui/game_chat_panel.cc 2019-05-12 07:45:59 +
+++ src/wui/game_chat_panel.cc 2019-05-12 13:12:29 +
@@ -41,12 +41,12 @@
0,
0,
w,
- h - 25,
+ h - 30,
style,
"",
UI::Align::kLeft,
UI::MultilineTextarea::ScrollMode::kScrollLogForced),
- editbox(this, 0, h - 20, w, style),
+ editbox(this, 0, h - 25, w, style),
chat_message_counter(0),
chat_sound(SoundHandler::register_fx(SoundType::kChat,
"sound/lobby_chat")) {
--
https://code.launchpad.net/~widelands-dev/widelands/font_size-lua/+merge/366938
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/font_size-lua into lp:widelands.
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/font_size-lua into lp:widelands
Found the bug and fixed the compiler warnings :) -- https://code.launchpad.net/~widelands-dev/widelands/font_size-lua/+merge/366938 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/font_size-lua into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/font_size-lua into lp:widelands
I get 2 compile warnings:
src/graphic/text/rt_render.cc:63:6: warning: no previous prototype for function
'replace_entities' [-Wmissing-prototypes]
void replace_entities(std::string* text) {
src/wui/building_statistics_menu.cc:41:15: warning: unused variable
'kTabHeight' [-Wunused-const-variable]
constexpr int kTabHeight = 35 + 5 * (kBuildGridCellHeight + kLabelHeight +
kLabelHeight);
--
https://code.launchpad.net/~widelands-dev/widelands/font_size-lua/+merge/366938
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/font_size-lua into lp:widelands.
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/font_size-lua into lp:widelands
Thanks, I can reproduce this. -- https://code.launchpad.net/~widelands-dev/widelands/font_size-lua/+merge/366938 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/font_size-lua into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/font_size-lua into lp:widelands
Here is the save game: https://bugs.launchpad.net/widelands/+bug/1828627/+attachment/5262992/+files/wl_autosave_00.wgf -- https://code.launchpad.net/~widelands-dev/widelands/font_size-lua/+merge/366938 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/font_size-lua into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/font_size-lua into lp:widelands
I get a crash when trying to open the buildings statistics menu:
Texture (21925, 7772) too big! Maximum size is 2048.
Fatal exception: Texture (21925, 7772) too big! Maximum size is 2048.
FATAL ERROR - game crashed. Attempting emergency save.
The crash does not appear in current trunk, so i guess it is in this branch.
Backtrace:
FATAL ERROR - game crashed. Attempting emergency save.
Game: Writing Preload Data ...
Thread 1 "widelands" received signal SIGSEGV, Segmentation fault.
Widelands::GamePreloadPacket::write (this=0x7fff9700, fs=..., game=...)
at
/home/kaputtnik/Quellcode/widelands-repo/font_size-lua/src/game_io/game_preload_packet.cc:114
114 s.set_int("gametype",
static_cast(game.game_controller()->get_game_type()));
(gdb) bt
#0 Widelands::GamePreloadPacket::write (this=0x7fff9700, fs=..., game=...)
at
/home/kaputtnik/Quellcode/widelands-repo/font_size-lua/src/game_io/game_preload_packet.cc:114
#1 0x565af007 in Widelands::GameSaver::save (this=0x7fff9800)
at
/home/kaputtnik/Quellcode/widelands-repo/font_size-lua/src/game_io/game_saver.cc:51
#2 0x56148385 in
SaveHandleroperator()(FileSystem &) const (
__closure=0x7fff9cb0, fs=...)
at
/home/kaputtnik/Quellcode/widelands-repo/font_size-lua/src/logic/save_handler.cc:250
#3 0x56148757 in std::_Function_handler >::_M_invoke(const std::_Any_data
&, FileSystem &) (
__functor=..., __args#0=...) at
/usr/include/c++/8.3.0/bits/std_function.h:297
#4 0x56474f11 in std::function::operator()(FileSystem&) const (this=0x7fff9cb0,
__args#0=...) at /usr/include/c++/8.3.0/bits/std_function.h:687
#5 0x56472a2d in GenericSaveHandler::save_file (this=0x7fff9cb0)
at
/home/kaputtnik/Quellcode/widelands-repo/font_size-lua/src/logic/generic_save_handler.cc:108
#6 0x56472f14 in GenericSaveHandler::save (this=0x7fff9cb0)
at
/home/kaputtnik/Quellcode/widelands-repo/font_size-lua/src/logic/generic_save_handler.cc:166
#7 0x561484be in SaveHandler::save_game (this=0x7fffa910,
game=...,
complete_filename="save/2019-05-10T22.59.49.wgf", error_str=0x7fff9e90)
at
/home/kaputtnik/Quellcode/widelands-repo/font_size-lua/src/logic/save_handler.cc:253
#8 0x55f7434e in WLApplication::emergency_save (game=...)
at
/home/kaputtnik/Quellcode/widelands-repo/font_size-lua/src/wlapplication.cc:1482
#9 0x55f73774 in WLApplication::load_game (this=0x56d08150)
at
/home/kaputtnik/Quellcode/widelands-repo/font_size-lua/src/wlapplication.cc:1384
#10 0x55f722fe in WLApplication::mainmenu_singleplayer
(this=0x56d08150)
at
/home/kaputtnik/Quellcode/widelands-repo/font_size-lua/src/wlapplication.cc:1207
#11 0x55f71c2b in WLApplication::mainmenu (this=0x56d08150)
at
/home/kaputtnik/Quellcode/widelands-repo/font_size-lua/src/wlapplication.cc:1109
#12 0x55f6dfa7 in WLApplication::run (this=0x56d08150)
at
/home/kaputtnik/Quellcode/widelands-repo/font_size-lua/src/wlapplication.cc:465
#13 0x55f6c2be in main (argc=1, argv=0x7fffe578)
at /home/kaputtnik/Quellcode/widelands-repo/font_size-lua/src/main.cc:44
--
https://code.launchpad.net/~widelands-dev/widelands/font_size-lua/+merge/366938
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/font_size-lua into lp:widelands.
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/font_size-lua into lp:widelands
Continuous integration builds have changed state: Travis build 4882. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/528138938. Appveyor build 4663. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_font_size_lua-4663. -- https://code.launchpad.net/~widelands-dev/widelands/font_size-lua/+merge/366938 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/font_size-lua into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/font_size-lua into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/font_size-lua into lp:widelands has been updated. Commit message changed to: Except for scenario and win condition messages, define all font styles via Lua. Reduce the number of construtors in TextArea. For more details, see: https://code.launchpad.net/~widelands-dev/widelands/font_size-lua/+merge/366938 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/font_size-lua into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
