Skip to content
Snippets Groups Projects
Commit 8026f763 authored by Stian Fjæran Mogen's avatar Stian Fjæran Mogen
Browse files

Merge branch 'fix/patchFix' into 'dev'

Minor fixes

See merge request !232
parents 6e1ce4ad 72716b13
No related branches found
No related tags found
2 merge requests!233Final merge to master!,!232Minor fixes
Pipeline #83244 passed
...@@ -56,6 +56,11 @@ public class NavBarController { ...@@ -56,6 +56,11 @@ public class NavBarController {
} }
/***
* Method that changes scene to Search page. It reads the value of the search
* field and if not empty it is passed to {@link DataExchange}
* @throws IOException
*/
public void search() throws IOException { public void search() throws IOException {
doBeforePageExit(); doBeforePageExit();
...@@ -68,8 +73,7 @@ public class NavBarController { ...@@ -68,8 +73,7 @@ public class NavBarController {
} }
/** /**
* Method that changes scene to Search page. It reads the value of the search * Method that calls the search method when the search button is pressed
* field and if not empty it is passed to {@link DataExchange}
* @param actionEvent * @param actionEvent
* @throws IOException * @throws IOException
*/ */
...@@ -77,6 +81,12 @@ public class NavBarController { ...@@ -77,6 +81,12 @@ public class NavBarController {
search(); search();
} }
/***
* Method that calls the search method when the Enter key is pressed while the
* search field is in focus
* @param keyEvent
* @throws IOException
*/
public void enterSearch(KeyEvent keyEvent) throws IOException { public void enterSearch(KeyEvent keyEvent) throws IOException {
if(keyEvent.getCode().equals(KeyCode.ENTER)){ if(keyEvent.getCode().equals(KeyCode.ENTER)){
search(); search();
......
...@@ -152,6 +152,17 @@ ...@@ -152,6 +152,17 @@
-fx-text-base-color: #10101f; -fx-text-base-color: #10101f;
} }
.tab:selected{
-fx-border-radius: 5 5 0 0;
-fx-border-width: 2px;
-fx-background-radius: 5 5 0 0;
-fx-background-color: rgba(255, 255, 255, 0.1);
-fx-border-color: rgba(17, 238, 238, 0.5);
}
.tab{
-fx-border-radius: 5 5 0 0;
-fx-background-radius: 5 5 0 0;
}
.tab-header-background{ .tab-header-background{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment