Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Multiple Sidebar Panel Layouts #28152

Merged
merged 30 commits into from Mar 19, 2019
Merged

Multiple Sidebar Panel Layouts #28152

merged 30 commits into from Mar 19, 2019

Conversation

KorGgenT
Copy link
Member

@KorGgenT KorGgenT commented Feb 10, 2019

Summary

SUMMARY: Interface "Multiple Sidebar Panel Layouts"

Purpose of change

Closes #26706

Closes #27367
Makes the sidebar much more customizable.

Describe the solution

Uses @nsklaus 's idea of the rearrange-able panel system in the sidebar, and expands that to have the ability to have multiple layouts.

Describe alternatives you've considered

Additional context

"Classic":
image

image

image

"Compact":
image

image

image

"Labels": (panel in screenshot is the window that allows panel selection)
image

image

image

Currently does not save settings when you close the game.
Will want some input from translators.

  • compass?
  • Center panel admin.
  • Pixel minimap

@OrenAudeles
Copy link
Contributor

Does this work in Curses builds or is it Tiles only?

@KorGgenT
Copy link
Member Author

still need to try curses, this definitely works in tiles

@Amneiger
Copy link
Contributor

I said this on Reddit already, but I'm very happy to see a player-customizable UI.

My C++ is too substandard to figure this out: which option is the default that's used when loading the game?

The screenshot for the classic vehicle sidebar is the same as the screenshot for the compact vehicle sidebar. For everyone's peace of mind, could you take a moment to get that fixed?

@KorGgenT
Copy link
Member Author

KorGgenT commented Feb 10, 2019

I said this on Reddit already, but I'm very happy to see a player-customizable UI.

My C++ is too substandard to figure this out: which option is the default that's used when loading the game?

The screenshot for the classic vehicle sidebar is the same as the screenshot for the compact vehicle sidebar. For everyone's peace of mind, could you take a moment to get that fixed?

"classic" is default when loading the game

@ZhilkinSerg ZhilkinSerg added <Enhancement / Feature> New features, or enhancements on existing Info / User Interface Game - player communication, menus, etc. [JSON] Changes (can be) made in JSON [C++] Changes (can be) made in C++. Previously named `Code` 0.D Freeze labels Feb 10, 2019
@kevingranade kevingranade mentioned this pull request Feb 11, 2019
@Amneiger
Copy link
Contributor

"classic" is default when loading the game

Got it, thanks.

It looks like you changed the screenshots? The current classic vehicle screenshot doesn't match what I see in a pre-UI changes build:

classic vehicle sidebar

I use Safe mode in vehicles to help me notice nearby mi-gos and crash sites when driving in new places, or to see when I'm getting too close to an uncleared town, so the absence of it stood out to me. I also noticed the lack of temperature, because I like to know when it's okay to plant seeds or immediately notice if I've stepped into an ice lab, and then I just don't bother putting the thermometer down.

@KorGgenT
Copy link
Member Author

"classic" is default when loading the game

Got it, thanks.

It looks like you changed the screenshots? The current classic vehicle screenshot doesn't match what I see in a pre-UI changes build:

classic vehicle sidebar

I use Safe mode in vehicles to help me notice nearby mi-gos and crash sites when driving in new places, or to see when I'm getting too close to an uncleared town, so the absence of it stood out to me. I also noticed the lack of temperature, because I like to know when it's okay to plant seeds or immediately notice if I've stepped into an ice lab, and then I just don't bother putting the thermometer down.

I see. That's a pretty easy fix. I sort of moved the fuel gauge because i thought it would be better to have more information (i.e. your stats) while driving, and having safe mode on is pretty much irrelevant, though i guess i can put it back to be totally the old style. also the temp does show, i just only had a thermometer on me in the third screenshot (in the lab)

I will also say that once the ability to save the settings is put in (no promises it will be this PR) the default will be made into "labels" since labels make it a bit easier for new players.

@Amneiger
Copy link
Contributor

i guess i can put it back to be totally the old style

Folks are a bit twitchy about this at the moment. I'm going to suggest that classic be as close to the original UI as much as possible.

I will also say that once the ability to save the settings is put in (no promises it will be this PR) the default will be made into "labels" since labels make it a bit easier for new players.

That's fair, since people will be able to save their settings and not have to use the other UIs if they don't want to.

@KorGgenT KorGgenT changed the title [WIP] Multiple Sidebar Panel Layouts Multiple Sidebar Panel Layouts Feb 13, 2019
@KorGgenT
Copy link
Member Author

I have made edits until I can't see any more edits to make. For those of you following this PR and do not know how to compile, and also run windows, I have made a distributable for you to check out.

@AMurkin
Copy link
Contributor

AMurkin commented Feb 15, 2019

Manage zones and List all items around have display issues.

@AMurkin
Copy link
Contributor

AMurkin commented Feb 15, 2019

Also Sidebar position (Right/Left) option does nothing now. And game.h have unused bool right_sidebar;

@KorGgenT
Copy link
Member Author

@AMurkin I fixed the sidebar position thing, would you elaborate on the display issues you are referring to?

@AMurkin
Copy link
Contributor

AMurkin commented Feb 16, 2019

Manage zones

No zones around:

Now PR
default default

If there is a zone defined, inner part of the zones manager is momentarily displayed and erased.

List all items around

Now PR
default default

@AMurkin
Copy link
Contributor

AMurkin commented Feb 17, 2019

When I scroll items in List all items around window sometimes it didn't draw target marker to item's position. Also if sidebar position is set to Left, it hides sometimes.

Zones doesn't highlighted now. In the master version their tiles are blinking.
No border here at the bottom-right:
default

@kevingranade kevingranade added this to Candidate Features in 0.E Release Feb 18, 2019
@I-am-Erk
Copy link
Contributor

I-am-Erk commented Feb 19, 2019

Does this solve #14748?

@KorGgenT
Copy link
Member Author

not by itself

@kevingranade kevingranade merged commit 353ca4b into CleverRaven:master Mar 19, 2019
0.E Release automation moved this from Non-vote Candidate (Maintainer's Choice) to Done Mar 19, 2019
@KorGgenT KorGgenT deleted the ui branch March 19, 2019 03:32
@rumly111
Copy link
Contributor

I get segfault when I try to turn on the pixel minimap

@ghost
Copy link

ghost commented Mar 19, 2019

still need to try curses, this definitely works in tiles

yea, get back with that before clearing to merge, oh wait..

@ghost ghost mentioned this pull request Mar 19, 2019
@KorGgenT
Copy link
Member Author

still need to try curses, this definitely works in tiles

yea, get back with that before clearing to merge, oh wait..

sorry. we spoke about it on discord at the time. it worked.

minimapY = 0;
pixelminimapW = MINIMAP_WIDTH;
pixelminimapH = ( pixelminimapW / 2 );
if( pixel_minimap_custom_height &&
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe here

int window_panel::get_height() const
{
if( height == -1 ) {
return get_option<int>( "PIXEL_MINIMAP_HEIGHT" );
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe here

@ghost
Copy link

ghost commented Mar 19, 2019

This will cause problems with editmap()
I've fixed one crash from faction camps callign editmap.
There will likely be others ( int in discord has found one )
Probably with debug map editing and anything that uses editmap.
width = TERMX - TERRAIN_WINDOW_TERM_WIDTH; in editmap() will be zero now, it seems, when before it wasnt.
and a zero width will cause problems.

@paulenka-aleh
Copy link

paulenka-aleh commented Mar 22, 2019

@KorGgenT

How do I enter sidebar options menu?

Sorry for a dumb question, just downloaded latest experimental, copied previous settings and after playing for 5 minutes realized minimap is too way small for me and some menus float to the left (e.g. pickup) while I used to focus on the right side while paying the game. I tried googling, checking help, checking keybindings, going through options but didn't manage to find a way. I didn't dived into the code yet though...

Edit: okay, I guess "Toggle Panel Admin" isn't something I could guess... I would really rename it to, say "Customize sidebar" / "Sidebar options" / "Configure sidebar" / "Sidebar config" or anything alike. It's already called "sidebar" in options so one is likely to look for it rather than "panel". "Admin" isn't something I thought of either, don't think anything in game is called so... And it's not actually "toggle" too, the key just brings up the customization menu and labels, but it won't hide it back.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[C++] Changes (can be) made in C++. Previously named `Code` <Enhancement / Feature> New features, or enhancements on existing Info / User Interface Game - player communication, menus, etc. [JSON] Changes (can be) made in JSON
Projects
No open projects
0.E Release
  
Done
Development

Successfully merging this pull request may close these issues.

sidebar needs an overhaul Option to hide nearby monsters indicator.
10 participants