Просмотр исходного кода

Add fullscreen mode to level editor

Daniele Bartolini 8 лет назад
Родитель
Сommit
b647437f5e
3 измененных файлов с 106 добавлено и 84 удалено
  1. 84 84
      tools/gresources.c
  2. 20 0
      tools/level_editor/level_editor.vala
  3. 2 0
      tools/level_editor/level_editor.xml

+ 84 - 84
tools/gresources.c

@@ -2319,90 +2319,90 @@ static const SECTION union { const guint8 data[43484]; const double alignment; v
   0x2f, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 
   0x6c, 0x65, 0x76, 0x65, 0x6c, 0x5f, 0x65, 0x64, 
   0x69, 0x74, 0x6f, 0x72, 0x2e, 0x78, 0x6d, 0x6c, 
-  0x65, 0x0c, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-  0x78, 0xda, 0x8d, 0x97, 0xcd, 0x92, 0xdb, 0x20, 
-  0x0c, 0xc7, 0xef, 0xfb, 0x14, 0x19, 0xee, 0x6c, 
-  0x92, 0xb6, 0x99, 0xd9, 0xce, 0x24, 0xd9, 0x5b, 
-  0x9f, 0xa0, 0x7d, 0x00, 0x8c, 0x15, 0x87, 0x29, 
-  0x46, 0x94, 0x8f, 0x64, 0xf3, 0xf6, 0x05, 0xdb, 
-  0xd9, 0x38, 0x6b, 0xc0, 0xbe, 0x05, 0xfe, 0x3f, 
-  0x0b, 0x21, 0x04, 0x52, 0xf6, 0xef, 0x1f, 0xad, 
-  0x5c, 0x5d, 0xc0, 0x58, 0x81, 0xea, 0x40, 0xb6, 
-  0xaf, 0x1b, 0xb2, 0x02, 0xc5, 0xb1, 0x16, 0xaa, 
-  0x39, 0x90, 0x3f, 0xbf, 0x7f, 0xd1, 0x37, 0xf2, 
-  0x7e, 0x7c, 0xd9, 0x7b, 0x71, 0xdc, 0xb7, 0xa0, 
-  0x7c, 0xc5, 0xcc, 0x4a, 0xb1, 0x16, 0x0e, 0x64, 
-  0x18, 0x91, 0x7e, 0x7e, 0xc5, 0xb8, 0xeb, 0x2c, 
-  0xc4, 0x01, 0x3d, 0x09, 0x09, 0x83, 0x20, 0x1c, 
-  0xb4, 0x9f, 0xa2, 0x82, 0x2b, 0x59, 0x27, 0xe6, 
-  0x51, 0x83, 0x4a, 0x0a, 0x96, 0x5d, 0x20, 0x2b, 
-  0x50, 0x66, 0xa3, 0x66, 0x41, 0x33, 0xc3, 0x1c, 
-  0x9a, 0xf5, 0x17, 0x57, 0x44, 0xab, 0xd1, 0xb8, 
-  0x94, 0x1f, 0xbd, 0x42, 0xad, 0x36, 0x61, 0xda, 
-  0x26, 0x17, 0x18, 0x90, 0x16, 0xec, 0xb9, 0x4c, 
-  0x58, 0xf4, 0xaa, 0x2e, 0x12, 0x0e, 0x3e, 0x9c, 
-  0x37, 0xbd, 0x95, 0x75, 0x84, 0xa6, 0x3e, 0x3f, 
-  0x7d, 0xa6, 0x0d, 0x9c, 0xc0, 0x84, 0x53, 0x80, 
-  0xe4, 0xfe, 0x9e, 0xd8, 0x7f, 0x61, 0x38, 0xb2, 
-  0x3b, 0x3d, 0x0a, 0xa8, 0x45, 0x32, 0x04, 0xc1, 
-  0x69, 0x4c, 0x3a, 0x6d, 0xa0, 0x17, 0x8a, 0xcb, 
-  0xd6, 0x5e, 0x4b, 0xc1, 0x99, 0x4b, 0x1f, 0x4e, 
-  0x0d, 0x12, 0x7a, 0xa9, 0xbc, 0x4f, 0xc9, 0x78, 
-  0xda, 0x40, 0x8b, 0x99, 0x63, 0x37, 0xe8, 0x72, 
-  0x8b, 0x5a, 0xce, 0xe4, 0xfc, 0x9a, 0x56, 0x31, 
-  0x4d, 0x0d, 0x48, 0xe6, 0x44, 0x2e, 0xb3, 0x22, 
-  0xc1, 0x2a, 0x8b, 0xd2, 0x2f, 0xd8, 0xc3, 0xe7, 
-  0x51, 0x51, 0x7b, 0xb3, 0x41, 0xa0, 0x12, 0x83, 
-  0x1f, 0x64, 0x11, 0x7a, 0x45, 0x23, 0xeb, 0x65, 
-  0x1e, 0x3b, 0xa4, 0x8d, 0x11, 0x75, 0x31, 0xdd, 
-  0xbb, 0xe3, 0xee, 0xa8, 0x84, 0x95, 0x38, 0x4f, 
-  0xed, 0x19, 0xaf, 0xb3, 0xeb, 0x75, 0x24, 0xf7, 
-  0xd6, 0x61, 0xbb, 0x8c, 0xdd, 0xbc, 0x6e, 0x49, 
-  0x41, 0xfc, 0x56, 0x12, 0x77, 0x79, 0xb1, 0x60, 
-  0xb4, 0x60, 0x72, 0x57, 0xbc, 0x0c, 0x5d, 0xfa, 
-  0x84, 0x21, 0x8d, 0x41, 0x25, 0xb9, 0xfc, 0xba, 
-  0x03, 0x4b, 0xa3, 0xf0, 0xfc, 0xd1, 0x96, 0x2c, 
-  0x60, 0x76, 0x0b, 0xa0, 0xef, 0x9b, 0x05, 0xd0, 
-  0x8f, 0x25, 0x96, 0x7e, 0x2e, 0xb1, 0xb4, 0x7d, 
-  0xdb, 0x8c, 0x62, 0x97, 0x0d, 0x21, 0x37, 0x10, 
-  0x6f, 0x60, 0x4a, 0x0a, 0xaf, 0x69, 0x2b, 0xe2, 
-  0xbd, 0xb2, 0x24, 0xf9, 0xaa, 0x0d, 0x6a, 0x08, 
-  0x6b, 0x95, 0xbe, 0x7a, 0x0f, 0xc4, 0xea, 0x73, 
-  0xb8, 0x2b, 0x33, 0x10, 0x47, 0x35, 0x8b, 0xdc, 
-  0xa4, 0x50, 0x35, 0x98, 0x19, 0x2c, 0xbc, 0x44, 
-  0xbd, 0xa9, 0xd1, 0xb6, 0x9f, 0x50, 0x1e, 0x4a, 
-  0x9e, 0x61, 0x49, 0x2b, 0x52, 0x34, 0x67, 0x97, 
-  0x7e, 0x49, 0x62, 0x65, 0x88, 0xf5, 0xc1, 0x70, 
-  0x28, 0xa6, 0xe5, 0x60, 0x3d, 0xbb, 0x2e, 0xbd, 
-  0x08, 0xb8, 0x52, 0x1d, 0x8a, 0xb4, 0x06, 0x7e, 
-  0x7f, 0xb8, 0x8a, 0x29, 0x39, 0xfe, 0xee, 0x64, 
-  0x50, 0xa5, 0x1d, 0x1c, 0x53, 0x15, 0xe3, 0x7f, 
-  0x67, 0x21, 0x93, 0xdd, 0xeb, 0x98, 0x92, 0x70, 
-  0x9a, 0x87, 0x1c, 0xea, 0x79, 0x9f, 0xd0, 0x0d, 
-  0xf7, 0x2f, 0x1b, 0xba, 0xc8, 0x25, 0x2f, 0x32, 
-  0xf4, 0x71, 0xa7, 0x95, 0xc1, 0xab, 0xed, 0x13, 
-  0xa0, 0x5c, 0xd1, 0xa0, 0xf2, 0x4d, 0xa8, 0x0c, 
-  0x31, 0x5b, 0x1e, 0x2f, 0x73, 0x06, 0xd3, 0xe7, 
-  0x9b, 0x15, 0xdc, 0x3e, 0xb8, 0x7c, 0xf9, 0x55, 
-  0x8d, 0x50, 0x90, 0xf1, 0xd0, 0x31, 0xe3, 0x16, 
-  0x54, 0x18, 0x89, 0xac, 0xa6, 0xd2, 0xb3, 0xf2, 
-  0xd3, 0xe6, 0x55, 0x6a, 0x95, 0xd0, 0xde, 0xb8, 
-  0x70, 0x20, 0x17, 0xc8, 0xd4, 0x24, 0xaf, 0x68, 
-  0x13, 0x22, 0x5e, 0x34, 0x7d, 0x06, 0x99, 0x7c, 
-  0x2c, 0x5b, 0xa6, 0x7c, 0xb6, 0xd6, 0x75, 0x9d, 
-  0x8f, 0xb0, 0xd6, 0xcf, 0x27, 0x6b, 0xec, 0xfe, 
-  0xa8, 0x64, 0xd1, 0x51, 0x6c, 0x66, 0x69, 0x56, 
-  0xa1, 0x77, 0x5f, 0x5f, 0xaa, 0xd0, 0x88, 0x1e, 
-  0xf7, 0x0e, 0x51, 0x3e, 0xfa, 0xd3, 0x61, 0x44, 
-  0xfa, 0xf9, 0x74, 0xe3, 0x31, 0x51, 0xee, 0x8d, 
-  0xc7, 0x44, 0x78, 0x34, 0x1e, 0x13, 0x29, 0xd9, 
-  0x78, 0x4c, 0xa9, 0xaf, 0x8d, 0x47, 0x9a, 0xc8, 
-  0x35, 0x1e, 0x53, 0x87, 0xb2, 0x8d, 0xc7, 0x3c, 
-  0x9a, 0x6c, 0x3c, 0xd2, 0xfe, 0x64, 0x1a, 0x8f, 
-  0x09, 0xfc, 0x9c, 0x67, 0xeb, 0x21, 0xf8, 0xe1, 
-  0x57, 0xf8, 0xe3, 0xf0, 0xf2, 0x1f, 0x39, 0x4b, 
-  0x74, 0xf1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x90, 0x0c, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
+  0x78, 0xda, 0x8d, 0x57, 0xdb, 0x92, 0xdb, 0x20, 
+  0x0c, 0x7d, 0xdf, 0xaf, 0xc8, 0xf0, 0xce, 0x26, 
+  0x69, 0x9b, 0x99, 0xed, 0x4c, 0x92, 0x7d, 0xeb, 
+  0x17, 0xb4, 0x1f, 0x80, 0xb1, 0xe2, 0x30, 0xc5, 
+  0x88, 0x72, 0x49, 0x36, 0x7f, 0x5f, 0xb0, 0x9d, 
+  0x8d, 0xb3, 0x06, 0xec, 0xb7, 0xc0, 0x39, 0x16, 
+  0x42, 0x12, 0xd2, 0xc9, 0xfe, 0xfd, 0xa3, 0x95, 
+  0xab, 0x0b, 0x18, 0x2b, 0x50, 0x1d, 0xc8, 0xf6, 
+  0x75, 0x43, 0x56, 0xa0, 0x38, 0xd6, 0x42, 0x35, 
+  0x07, 0xf2, 0xe7, 0xf7, 0x2f, 0xfa, 0x46, 0xde, 
+  0x8f, 0x2f, 0x7b, 0x2f, 0x8e, 0xfb, 0x16, 0x94, 
+  0xaf, 0x98, 0x59, 0x29, 0xd6, 0xc2, 0x81, 0x0c, 
+  0x2b, 0xd2, 0xef, 0xaf, 0x18, 0x77, 0x9d, 0x85, 
+  0xb8, 0xa0, 0x27, 0x21, 0x61, 0x00, 0x84, 0x83, 
+  0xf6, 0x13, 0x54, 0x70, 0x25, 0xeb, 0xc4, 0x3e, 
+  0x6a, 0x50, 0x49, 0xc0, 0xb2, 0x0b, 0x64, 0x01, 
+  0xca, 0x6c, 0xc4, 0x2c, 0x68, 0x66, 0x98, 0x43, 
+  0xb3, 0xfe, 0xe2, 0x8a, 0x68, 0x35, 0x1a, 0x97, 
+  0xf2, 0xa3, 0x47, 0xa8, 0xd5, 0x26, 0x6c, 0xdb, 
+  0xe4, 0x01, 0x03, 0xa5, 0x05, 0x7b, 0x2e, 0x33, 
+  0x2c, 0x7a, 0x55, 0x17, 0x19, 0x0e, 0x3e, 0x9c, 
+  0x37, 0xbd, 0x95, 0x75, 0x24, 0x4d, 0x7d, 0x7e, 
+  0xfa, 0x4c, 0x1b, 0x38, 0x81, 0x09, 0x59, 0x80, 
+  0xe4, 0xfd, 0x9e, 0xb8, 0xff, 0xc2, 0x72, 0x64, 
+  0x77, 0x9a, 0x0a, 0xa8, 0x45, 0x32, 0x04, 0xc1, 
+  0x69, 0x4c, 0x3a, 0x6d, 0xa0, 0x07, 0x8a, 0xc7, 
+  0xd6, 0x5e, 0x4b, 0xc1, 0x99, 0x4b, 0x27, 0xa7, 
+  0x06, 0x09, 0x3d, 0x54, 0xbe, 0xa7, 0x64, 0x3c, 
+  0x6d, 0xa0, 0xc5, 0x4c, 0xda, 0x0d, 0xba, 0xdc, 
+  0xa1, 0x96, 0x33, 0x39, 0x7f, 0xa6, 0x55, 0x4c, 
+  0x53, 0x03, 0x92, 0x39, 0x91, 0xab, 0xac, 0xc8, 
+  0x60, 0x95, 0x45, 0xe9, 0x17, 0xdc, 0xe1, 0x33, 
+  0x55, 0xd4, 0xde, 0x6c, 0x00, 0xa8, 0xc4, 0xe0, 
+  0x07, 0x59, 0x44, 0xbd, 0xa2, 0x91, 0xf5, 0x32, 
+  0x8f, 0x1d, 0xd2, 0xc6, 0x88, 0xba, 0x58, 0xee, 
+  0x5d, 0xba, 0x3b, 0x56, 0xc2, 0x4a, 0xdc, 0xa7, 
+  0xf6, 0x8c, 0xd7, 0xd9, 0xf3, 0x3a, 0x26, 0xf7, 
+  0xd6, 0x61, 0xbb, 0x8c, 0xbb, 0x79, 0xdd, 0x92, 
+  0x02, 0xf8, 0xad, 0x04, 0xee, 0xf2, 0x60, 0xc1, 
+  0x68, 0xc1, 0xe4, 0xae, 0xf8, 0x18, 0xba, 0xf2, 
+  0x09, 0x4b, 0x1a, 0x83, 0x4a, 0x72, 0xf5, 0x75, 
+  0x27, 0x2c, 0x8d, 0xc2, 0xf3, 0x47, 0x5b, 0xb2, 
+  0x80, 0xb3, 0x5b, 0x40, 0xfa, 0xbe, 0x59, 0x40, 
+  0xfa, 0xb1, 0xc4, 0xd2, 0xcf, 0x25, 0x96, 0xb6, 
+  0x6f, 0x9b, 0x51, 0xec, 0xb2, 0x21, 0xe4, 0x06, 
+  0xe2, 0x0b, 0x4c, 0x41, 0xa1, 0x9b, 0xb6, 0x22, 
+  0xbe, 0x2b, 0x4b, 0x92, 0x5d, 0x6d, 0x40, 0x43, 
+  0x58, 0xab, 0xf4, 0xd3, 0x7b, 0x50, 0xac, 0x3e, 
+  0x87, 0xb7, 0x32, 0x43, 0xe2, 0xa8, 0x66, 0x29, 
+  0x37, 0x29, 0x54, 0x0d, 0x66, 0x86, 0x16, 0x3a, 
+  0x51, 0x6f, 0x6a, 0x74, 0xed, 0x27, 0x2a, 0x0f, 
+  0x23, 0xcf, 0xb0, 0xa4, 0x15, 0x29, 0x9a, 0xb3, 
+  0x4b, 0x77, 0x92, 0x38, 0x19, 0xe2, 0x7c, 0x30, 
+  0x1c, 0x8a, 0x65, 0x39, 0x58, 0xcf, 0x9e, 0x4b, 
+  0x2f, 0x02, 0xae, 0x54, 0x87, 0x21, 0xad, 0x81, 
+  0xdf, 0x1b, 0x57, 0xb1, 0x24, 0xc7, 0xdf, 0x9d, 
+  0x0c, 0xaa, 0xb4, 0x83, 0x63, 0x56, 0xc5, 0xf8, 
+  0xdf, 0x59, 0x92, 0xc9, 0xde, 0x75, 0xcc, 0x92, 
+  0x70, 0x9a, 0x27, 0x39, 0xd4, 0xf3, 0x3e, 0xa1, 
+  0x1b, 0xde, 0x5f, 0x36, 0x74, 0x91, 0x97, 0x7c, 
+  0xc8, 0xd0, 0xc7, 0x9d, 0x56, 0x06, 0xaf, 0xb6, 
+  0x2f, 0x80, 0x62, 0xc4, 0x4e, 0x5e, 0x4a, 0x1b, 
+  0x8a, 0xbb, 0x17, 0x22, 0xe5, 0xe1, 0x07, 0x95, 
+  0x6f, 0xc2, 0x10, 0x89, 0x85, 0xf5, 0x68, 0xe2, 
+  0x19, 0x9a, 0x3e, 0xdf, 0xac, 0xe0, 0xf6, 0xc1, 
+  0xcb, 0x4f, 0x6a, 0xd5, 0x08, 0x05, 0x99, 0xcb, 
+  0x38, 0x66, 0xdc, 0x82, 0x61, 0x24, 0x91, 0xd5, 
+  0x54, 0x7a, 0x56, 0xee, 0x82, 0x5e, 0xa5, 0x4e, 
+  0x09, 0x4a, 0xc8, 0x85, 0xdc, 0x5d, 0x20, 0x33, 
+  0xbe, 0xbc, 0xa2, 0x4d, 0x48, 0x4e, 0xd1, 0xf4, 
+  0x19, 0x64, 0xb2, 0xaf, 0xb6, 0x4c, 0xf9, 0xec, 
+  0x58, 0xec, 0x44, 0x92, 0xb0, 0xd6, 0xcf, 0xd7, 
+  0x75, 0x14, 0x8a, 0x54, 0xb2, 0xe8, 0x28, 0x36, 
+  0xb3, 0x6c, 0x56, 0xa1, 0x77, 0x5f, 0x9b, 0x5a, 
+  0xd0, 0xac, 0xc7, 0xbd, 0x43, 0x94, 0x0f, 0x29, 
+  0x3b, 0xac, 0x48, 0xbf, 0x9f, 0xd6, 0x28, 0x13, 
+  0xe4, 0xae, 0x51, 0x26, 0xc0, 0x43, 0xa3, 0x4c, 
+  0xa0, 0xa4, 0x46, 0x99, 0xb2, 0xbe, 0x6a, 0x94, 
+  0x34, 0x23, 0xa7, 0x51, 0xa6, 0x0e, 0x65, 0x35, 
+  0xca, 0x3c, 0x35, 0xa9, 0x51, 0xd2, 0xfe, 0x64, 
+  0x34, 0xca, 0x84, 0xfc, 0x5c, 0x67, 0xeb, 0x21, 
+  0xf8, 0xe1, 0x57, 0xf8, 0x8f, 0xf1, 0xf2, 0x1f, 
+  0x57, 0x48, 0x84, 0xca, 0x00, 0x00, 0x00, 0x00, 
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 

+ 20 - 0
tools/level_editor/level_editor.vala

@@ -86,6 +86,8 @@ namespace Crown
 		private Gtk.Box _vbox;
 		private Gtk.FileFilter _file_filter;
 
+		private bool _fullscreen;
+
 		const Gtk.ActionEntry[] action_entries =
 		{
 			{ "menu-file",            null,  "_File",              null,             null,         null                       },
@@ -130,6 +132,7 @@ namespace Crown
 			{ "menu-engine",          null,  "En_gine",            null,             null,         null                       },
 			{ "menu-view",            null,  "View",               null,             null,         null                       },
 			{ "resource-browser",     null,  "Resource Browser",   "<ctrl>P",        null,         on_resource_browser        },
+			{ "fullscreen",           null,  "Fullscreen",         "F11",            null,         on_fullscreen              },
 			{ "restart",              null,  "_Restart",           null,             null,         on_engine_restart          },
 			{ "reload-lua",           null,  "Reload Lua",         "F7",             null,         on_reload_lua              },
 			{ "menu-run",             null,  "_Run",               null,             null,         null                       },
@@ -315,10 +318,13 @@ namespace Crown
 			// Save level once every 5 minutes.
 			GLib.Timeout.add_seconds(5*3600, save_timeout);
 
+			_fullscreen = false;
+
 			this.destroy.connect(this.on_destroy);
 			this.delete_event.connect(this.on_delete_event);
 			this.key_press_event.connect(this.on_key_press);
 			this.key_release_event.connect(this.on_key_release);
+			this.window_state_event.connect(this.on_window_state_event);
 
 			this.add(_vbox);
 			this.maximize();
@@ -347,6 +353,12 @@ namespace Crown
 			return false;
 		}
 
+		private bool on_window_state_event(EventWindowState ev)
+		{
+			_fullscreen = (ev.new_window_state & WindowState.FULLSCREEN) != 0;
+			return true;
+		}
+
 		private void on_resource_browser_resource_selected(string type, string name)
 		{
 			_engine.send_script(LevelEditorApi.set_placeable(type, name));
@@ -1215,6 +1227,14 @@ namespace Crown
 			_resource_browser.show_all();
 		}
 
+		private void on_fullscreen(Gtk.Action action)
+		{
+			if (_fullscreen)
+				this.unfullscreen();
+			else
+				this.fullscreen();
+		}
+
 		private void on_engine_restart(Gtk.Action action)
 		{
 			restart_engine();

+ 2 - 0
tools/level_editor/level_editor.xml

@@ -86,6 +86,8 @@
 		<menu action="menu-view">
 			<menuitem action="resource-browser"></menuitem>
 			<separator></separator>
+			<menuitem action="fullscreen"></menuitem>
+			<separator></separator>
 			<menuitem action="debug-render-world"></menuitem>
 			<menuitem action="debug-physics-world"></menuitem>
 		</menu>