Skip to content

Commit

Permalink
Make the trigger window slightly less wide (#353)
Browse files Browse the repository at this point in the history
Make some of the trigger type names shorter.
The window can be made a bit less wide.
Issue: #352
  • Loading branch information
chreden authored Oct 20, 2018
1 parent bb63ec3 commit fe14025
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions trview.app/Trigger.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ namespace trview
{
{ TriggerCommandType::Object, L"Object" },
{ TriggerCommandType::Camera, L"Camera" },
{ TriggerCommandType::UnderwaterCurrent, L"Underwater Current" },
{ TriggerCommandType::UnderwaterCurrent, L"Current" },
{ TriggerCommandType::FlipMap, L"Flip Map" },
{ TriggerCommandType::FlipOn, L"Flip On" },
{ TriggerCommandType::FlipOff, L"Flip Off" },
{ TriggerCommandType::LookAtItem, L"Look at Item" },
{ TriggerCommandType::EndLevel, L"End Level" },
{ TriggerCommandType::PlaySoundtrack, L"Play Soundtrack" },
{ TriggerCommandType::PlaySoundtrack, L"Music" },
{ TriggerCommandType::Flipeffect, L"Flipeffect" },
{ TriggerCommandType::SecretFound, L"Secret Found" },
{ TriggerCommandType::SecretFound, L"Secret" },
{ TriggerCommandType::ClearBodies, L"Clear Bodies" }
};
}
Expand Down
8 changes: 4 additions & 4 deletions trview.app/TriggersWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ namespace trview
using namespace graphics;

TriggersWindow::TriggersWindow(const Device& device, const IShaderStorage& shader_storage, const FontFactory& font_factory, HWND parent)
: CollapsiblePanel(device, shader_storage, font_factory, parent, L"trview.triggers", L"Triggers", Size(500, 400))
: CollapsiblePanel(device, shader_storage, font_factory, parent, L"trview.triggers", L"Triggers", Size(470, 400))
{
set_panels(create_left_panel(), create_right_panel());
}
Expand Down Expand Up @@ -105,7 +105,7 @@ namespace trview
std::unique_ptr<ui::Control> TriggersWindow::create_right_panel()
{
using namespace ui;
const float panel_width = 300;
const float panel_width = 270;
auto right_panel = std::make_unique<StackPanel>(Point(), Size(panel_width, window().size().height), Colours::ItemDetails, Size(), StackPanel::Direction::Vertical, SizeMode::Manual);
auto group_box = std::make_unique<GroupBox>(Point(), Size(panel_width, 190), Colours::ItemDetails, Colours::DetailsBorder, L"Trigger Details");

Expand All @@ -114,7 +114,7 @@ namespace trview
stats_list->set_columns(
{
{ Listbox::Column::Type::Number, L"Name", 100 },
{ Listbox::Column::Type::Number, L"Value", 180 },
{ Listbox::Column::Type::Number, L"Value", 150 },
}
);
stats_list->set_show_headers(false);
Expand All @@ -134,7 +134,7 @@ namespace trview
auto command_list = std::make_unique<Listbox>(Point(10, 21), Size(panel_width - 20, 160), Colours::Triggers);
command_list->set_columns(
{
{ Listbox::Column::Type::String, L"Type", 110 },
{ Listbox::Column::Type::String, L"Type", 80 },
{ Listbox::Column::Type::String, L"Index", 35 },
{ Listbox::Column::Type::String, L"Entity", 125 },
}
Expand Down

0 comments on commit fe14025

Please sign in to comment.